jonathan/openssh
1
0
Fork 0
forked from rpms/openssh
Code Pull Requests Activity

Ignore unknown parts of PKCS#11 URI

Browse Source
This commit is contained in:
Jakub Jelen 2018-09-21 15:50:04 +02:00
parent 55520c5691
commit e815fba204
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openssh-7.6p1-pkcs11-uri.patch
View File

@ -3314,7 +3314,7 @@ new file mode 100644
index 00000000..da15c164 index 00000000..da15c164
--- /dev/null --- /dev/null
+++ b/ssh-pkcs11-uri.c +++ b/ssh-pkcs11-uri.c
@@ -0,0 +1,401 @@ @@ -0,0 +1,395 @@
+/* +/*
+ * Copyright (c) 2017 Red Hat + * Copyright (c) 2017 Red Hat
+ * + *
@ -3619,11 +3619,6 @@ index 00000000..da15c164
+ if (tok == NULL) + if (tok == NULL)
+ break; + break;
+ opcode = parse_token(tok); + opcode = parse_token(tok);
+ if (opcode == pBadOption) {
+ free(p);
+ verbose("Unknown key in PKCS#11 URI: %s", tok);
+ return -1;
+ }
+ +
+ char *arg = tok + strlen(keywords[opcode].name) + 1; /* separator "=" */ + char *arg = tok + strlen(keywords[opcode].name) + 1; /* separator "=" */
+ switch (opcode) { + switch (opcode) {
@ -3678,7 +3673,6 @@ index 00000000..da15c164
+ /* Unrecognized attribute in the URI path SHOULD be error */ + /* Unrecognized attribute in the URI path SHOULD be error */
+ verbose("%s: Unknown part of path in PKCS#11 URI: %s", + verbose("%s: Unknown part of path in PKCS#11 URI: %s",
+ __func__, tok); + __func__, tok);
+ rv = -1;
+ } + }
+ } + }
+ +