[pkg-opensc-commit] [engine-pkcs11] 113/152: Refer to RFC7512 when reporting ID parse failure

[Eric Dorland]

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

eric pushed a commit to branch master
in repository engine-pkcs11.

commit 0cc9d88eb291f5c545e5bc91d56866a2e0e95d48
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Apr 29 12:43:30 2015 +0100

    Refer to RFC7512 when reporting ID parse failure
    
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 src/engine_pkcs11.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/engine_pkcs11.c b/src/engine_pkcs11.c
index 4bf5ae8..32c12ba 100644
--- a/src/engine_pkcs11.c
+++ b/src/engine_pkcs11.c
@@ -530,13 +530,11 @@ static X509 *pkcs11_load_cert(ENGINE * e, const char *s_slot_cert_id)
 		}
 		if (!n) {
 			fprintf(stderr,
-				"supported formats: <id>, <slot>:<id>, id_<id>, slot_<slot>-id_<id>, label_<label>, slot_<slot>-label_<label> or a PKCS#11 URI\n");
+				"The certificate ID should be a valid PKCS#11 URI as\n");
 			fprintf(stderr,
-				"where <slot> is the slot number as normal integer,\n");
+				"defined by RFC7512. The legacy ENGINE_pkcs11 ID format\n");
 			fprintf(stderr,
-				"and <id> is the id number as hex string.\n");
-			fprintf(stderr,
-				"and <label> is the textual key label string.\n");
+				"is also still accepted for now.\n");
 			return NULL;
 		}
 		if (verbose) {
@@ -718,13 +716,11 @@ static EVP_PKEY *pkcs11_load_key(ENGINE * e, const char *s_slot_key_id,
 
 		if (!n) {
 			fprintf(stderr,
-				"supported formats: <id>, <slot>:<id>, id_<id>, slot_<slot>-id_<id>, label_<label>, slot_<slot>-label_<label> or a PKCS#11 URI\n");
-			fprintf(stderr,
-				"where <slot> is the slot number as normal integer,\n");
+				"The key ID should be a valid PKCS#11 URI as defined by\n");
 			fprintf(stderr,
-				"and <id> is the id number as hex string.\n");
+				"RFC7512. The legacy ENGINE_pkcs11 ID format is also\n");
 			fprintf(stderr,
-				"and <label> is the textual key label string.\n");
+				"still accepted for now.\n");
 			return NULL;
 		}
 		if (verbose) {

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