rpms
/
pkcs11-helper
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix URI ID parsing (#1264645)

Browse Source
epel9
David Woodhouse 9 years ago
parent 8fb2232df5
commit 3a9fcbae1e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File

10
pkcs11-helper-rfc7512.patch
Unescape View File

@ -1,4 +1,4 @@
commit 41882e5e2e924ae1ee5aaec729a40484ccc3935d commit 8b614fd9554d3b372a829e4a05e21c5899f581ca
Author: David Woodhouse <David.Woodhouse@intel.com> Author: David Woodhouse <David.Woodhouse@intel.com>
Date: Thu Apr 30 14:58:24 2015 +0100 Date: Thu Apr 30 14:58:24 2015 +0100
@ -6,7 +6,7 @@ Date: Thu Apr 30 14:58:24 2015 +0100
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
commit 52e66b688c296f115c7bea6d5dd6a98eec33a337 commit db7a561668614b16b3a14564b3b4f71912db8e17
Author: David Woodhouse <David.Woodhouse@intel.com> Author: David Woodhouse <David.Woodhouse@intel.com>
Date: Wed Dec 10 14:00:21 2014 +0000 Date: Wed Dec 10 14:00:21 2014 +0000
@ -29,7 +29,7 @@ Date: Sun Dec 14 19:42:18 2014 +0000
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
diff --git a/lib/pkcs11h-serialization.c b/lib/pkcs11h-serialization.c diff --git a/lib/pkcs11h-serialization.c b/lib/pkcs11h-serialization.c
index ad275f8..cb85a35 100644 index ad275f8..1d077e4 100644
--- a/lib/pkcs11h-serialization.c --- a/lib/pkcs11h-serialization.c
+++ b/lib/pkcs11h-serialization.c +++ b/lib/pkcs11h-serialization.c
@@ -61,29 +61,127 @@ @@ -61,29 +61,127 @@
@ -300,7 +300,7 @@ index ad275f8..cb85a35 100644
+ p += 3; + p += 3;
+ +
+ rv = _pkcs11h_mem_malloc ((void *)&certificate_id->attrCKA_ID, + rv = _pkcs11h_mem_malloc ((void *)&certificate_id->attrCKA_ID,
+ end - p); + end - p + 1);
+ if (rv != CKR_OK) { + if (rv != CKR_OK) {
+ goto cleanup; + goto cleanup;
+ } + }
@ -318,7 +318,7 @@ index ad275f8..cb85a35 100644
- ) { - ) {
+ rv = __parse_token_uri_attr (p, end - p, + rv = __parse_token_uri_attr (p, end - p,
+ (char *)certificate_id->attrCKA_ID, + (char *)certificate_id->attrCKA_ID,
+ end - p, + end - p + 1,
+ &certificate_id->attrCKA_ID_size); + &certificate_id->attrCKA_ID_size);
+ if (rv != CKR_OK) { + if (rv != CKR_OK) {
goto cleanup; goto cleanup;

5
pkcs11-helper.spec
Unescape View File

@ -1,6 +1,6 @@
Name: pkcs11-helper Name: pkcs11-helper
Version: 1.11 Version: 1.11
Release: 6%{?dist} Release: 7%{?dist}
Summary: A library for using PKCS#11 providers Summary: A library for using PKCS#11 providers
Group: System Environment/Libraries Group: System Environment/Libraries
@ -77,6 +77,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%changelog %changelog
* Tue Sep 22 2015 David Woodhouse <David.Woodhouse@intel.com> - 1.11-7
- Fix ID buffer size for URI parsing (#1264645)
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-6 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

Write Preview
Loading…
Cancel
Save