[pkg-opensc-commit] [libp11] 03/12: "?" and "&" allowed as URI separators

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libp11.

commit 0178725e09dd7b00d4290359953951cfe26a7107
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Thu Jan 12 21:40:33 2017 +0100

    "?" and "&" allowed as URI separators
    
    Fixes #142
---
 NEWS            | 3 ++-
 src/eng_parse.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 6e21462..9690169 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,8 @@ NEWS for Libp11 -- History of user visible changes
 
 New in 0.4.4; unreleased
 * Fixed a state reset caused by re-login on LOAD_CERT_CTRL engine ctrl;
-  addresses #141 (Michał Trojnara)
+  fixes #141 (Michał Trojnara)
+* "?" and "&" allowed as URI separators; fixes #142 (Michał Trojnara)
 
 New in 0.4.3; 2016-12-04; Michał Trojnara
 * Use UI to get CKU_CONTEXT_SPECIFIC PINs (Michał Trojnara)
diff --git a/src/eng_parse.c b/src/eng_parse.c
index fe6b3fa..c9a0687 100644
--- a/src/eng_parse.c
+++ b/src/eng_parse.c
@@ -280,7 +280,7 @@ int parse_pkcs11_uri(const char *uri, PKCS11_TOKEN **p_tok,
 	end = uri + 6;
 	while (rv && end[0] && end[1]) {
 		p = end + 1;
-		end = strchr(p, ';');
+		end = strpbrk(p, ";?&");
 		if (end == NULL)
 			end = p + strlen(p);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/libp11.git