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

Accept empty labels (#1919007)

Browse Source
This commit is contained in:
Jakub Jelen 2021-01-22 12:21:03 +01:00
parent 557f728956
commit ee6f0fcc0a
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

@ -2159,12 +2159,13 @@ index a302c79c..879fe917 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);
@@ -717,18 +874,19 @@ pkcs11_fetch_ecdsa_pubkey(struct pkcs11_provider *p, CK_ULONG slotidx, @@ -717,19 +874,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);
@ -2259,12 +2260,13 @@ index a302c79c..879fe917 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);
@@ -838,18 +998,19 @@ pkcs11_fetch_rsa_pubkey(struct pkcs11_provider *p, CK_ULONG slotidx, @@ -838,19 +998,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);