rpms/openssh
7
0
Fork 1
Code Issues Pull Requests Releases Activity

pkcs11: Do not require the labels on the public objects (#1710832)

Browse Source
This commit is contained in:
Jakub Jelen 2019-05-16 15:14:52 +02:00
parent 53c9085316
commit ae802a53d8
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openssh-8.0p1-pkcs11-uri.patch
View File

@ -2111,12 +2111,13 @@ index 70f06bff..59332945 100644
if (rv != CKR_OK) { if (rv != CKR_OK) {
error("C_GetAttributeValue failed: %lu", rv); error("C_GetAttributeValue failed: %lu", rv);
return (NULL); return (NULL);
@@ -729,18 +863,19 @@ pkcs11_fetch_ecdsa_pubkey(struct pkcs11_provider *p, CK_ULONG slotidx, @@ -730,19 +863,19 @@ pkcs11_fetch_ecdsa_pubkey(struct pkcs11_provider *p, CK_ULONG slotidx,
* ensure that none of the others are zero length.
* XXX assumes CKA_ID is always first. * XXX assumes CKA_ID is always first.
*/ */
if (key_attr[1].ulValueLen == 0 || - if (key_attr[1].ulValueLen == 0 ||
- key_attr[2].ulValueLen == 0) { - key_attr[2].ulValueLen == 0) {
+ key_attr[2].ulValueLen == 0 || + if (key_attr[2].ulValueLen == 0 ||
+ key_attr[3].ulValueLen == 0) { + key_attr[3].ulValueLen == 0) {
error("invalid attribute length"); error("invalid attribute length");
return (NULL); return (NULL);
@ -2211,12 +2212,13 @@ index 70f06bff..59332945 100644
if (rv != CKR_OK) { if (rv != CKR_OK) {
error("C_GetAttributeValue failed: %lu", rv); error("C_GetAttributeValue failed: %lu", rv);
return (NULL); return (NULL);
@@ -850,18 +987,19 @@ pkcs11_fetch_rsa_pubkey(struct pkcs11_provider *p, CK_ULONG slotidx, @@ -850,19 +987,19 @@ pkcs11_fetch_rsa_pubkey(struct pkcs11_provider *p, CK_ULONG slotidx,
* ensure that none of the others are zero length.
* XXX assumes CKA_ID is always first. * XXX assumes CKA_ID is always first.
*/ */
if (key_attr[1].ulValueLen == 0 || - if (key_attr[1].ulValueLen == 0 ||
- key_attr[2].ulValueLen == 0) { - key_attr[2].ulValueLen == 0) {
+ key_attr[2].ulValueLen == 0 || + if (key_attr[2].ulValueLen == 0 ||
+ key_attr[3].ulValueLen == 0) { + key_attr[3].ulValueLen == 0) {
error("invalid attribute length"); error("invalid attribute length");
return (NULL); return (NULL);