[pkg-opensc-commit] [libp11] 12/27: Clarified error code mapping

[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 4166d321c94e05db7825c4814280cbc7535a9900
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Sat Jun 10 10:55:31 2017 +0200

    Clarified error code mapping
---
 src/libp11-int.h | 4 ++--
 src/p11_attr.c   | 4 ++--
 src/p11_ec.c     | 6 +++---
 src/p11_rsa.c    | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/libp11-int.h b/src/libp11-int.h
index dae0557..1e54976 100644
--- a/src/libp11-int.h
+++ b/src/libp11-int.h
@@ -122,7 +122,7 @@ typedef struct pkcs11_cert_private {
  * that the few genuine messages we use don't clash with
  * PKCS#11
  */
-#define pkcs11_map_err(rv)	(rv)
+#define CKR_to_PKCS11(rv)	(rv)
 
 /*
  * Internal functions
@@ -130,7 +130,7 @@ typedef struct pkcs11_cert_private {
 #define CRYPTOKI_checkerr(f, rv) \
 	do { \
 		if (rv) { \
-			PKCS11err(f, pkcs11_map_err(rv)); \
+			PKCS11err(f, CKR_to_PKCS11(rv)); \
 			return -1; \
 		} \
 		ERR_clear_error(); \
diff --git a/src/p11_attr.c b/src/p11_attr.c
index b7dfec4..f6b6e35 100644
--- a/src/p11_attr.c
+++ b/src/p11_attr.c
@@ -75,7 +75,7 @@ int pkcs11_getattr_alloc(PKCS11_TOKEN *token, CK_OBJECT_HANDLE object,
 		return -1;
 	data = OPENSSL_malloc(len+1);
 	if (data == NULL) {
-		PKCS11err(PKCS11_F_PKCS11_GETATTR, pkcs11_map_err(CKR_HOST_MEMORY));
+		PKCS11err(PKCS11_F_PKCS11_GETATTR, CKR_to_PKCS11(CKR_HOST_MEMORY));
 		return -1;
 	}
 	memset(data, 0, len+1); /* also null-terminate the allocated data */
@@ -103,7 +103,7 @@ int pkcs11_getattr_bn(PKCS11_TOKEN *token, CK_OBJECT_HANDLE object,
 	 */
 	if (size == (size_t)-1) {
 		PKCS11err(PKCS11_F_PKCS11_GETATTR,
-			pkcs11_map_err(CKR_ATTRIBUTE_TYPE_INVALID));
+			CKR_to_PKCS11(CKR_ATTRIBUTE_TYPE_INVALID));
 		OPENSSL_free(binary);
 		return -1;
 	}
diff --git a/src/p11_ec.c b/src/p11_ec.c
index 3ab1731..bbd10c2 100644
--- a/src/p11_ec.c
+++ b/src/p11_ec.c
@@ -333,7 +333,7 @@ static int pkcs11_ecdsa_sign(const unsigned char *msg, unsigned int msg_len,
 	CRYPTO_THREAD_unlock(PRIVCTX(ctx)->rwlock);
 
 	if (rv) {
-		PKCS11err(PKCS11_F_PKCS11_EC_KEY_SIGN, pkcs11_map_err(rv));
+		PKCS11err(PKCS11_F_PKCS11_EC_KEY_SIGN, CKR_to_PKCS11(rv));
 		return -1;
 	}
 	*siglen = ck_sigsize;
@@ -509,7 +509,7 @@ static int pkcs11_ecdh_derive(unsigned char **out, size_t *outlen,
 			break;
 #endif
 		default:
-			PKCS11err(PKCS11_F_PKCS11_EC_KEY_COMPUTE_KEY, pkcs11_map_err(PKCS11_NOT_SUPPORTED));
+			PKCS11err(PKCS11_F_PKCS11_EC_KEY_COMPUTE_KEY, PKCS11_NOT_SUPPORTED);
 			return -1;
 	}
 
@@ -520,7 +520,7 @@ static int pkcs11_ecdh_derive(unsigned char **out, size_t *outlen,
 	if (out && outlen) { /* pkcs11_ec_ckey only asks for the value */
 		if (pkcs11_getattr_alloc(token, newkey, CKA_VALUE, out, outlen)) {
 			PKCS11err(PKCS11_F_PKCS11_EC_KEY_COMPUTE_KEY,
-				pkcs11_map_err(CKR_ATTRIBUTE_VALUE_INVALID));
+				CKR_to_PKCS11(CKR_ATTRIBUTE_VALUE_INVALID));
 			CRYPTOKI_call(ctx, C_DestroyObject(spriv->session, newkey));
 			return -1;
 		}
diff --git a/src/p11_rsa.c b/src/p11_rsa.c
index 5319393..69e8758 100644
--- a/src/p11_rsa.c
+++ b/src/p11_rsa.c
@@ -117,7 +117,7 @@ int pkcs11_private_encrypt(int flen,
 	CRYPTO_THREAD_unlock(PRIVCTX(ctx)->rwlock);
 
 	if (rv) {
-		PKCS11err(PKCS11_F_PKCS11_RSA_ENCRYPT, pkcs11_map_err(rv));
+		PKCS11err(PKCS11_F_PKCS11_RSA_ENCRYPT, CKR_to_PKCS11(rv));
 		return -1;
 	}
 
@@ -151,7 +151,7 @@ int pkcs11_private_decrypt(int flen, const unsigned char *from, unsigned char *t
 	CRYPTO_THREAD_unlock(PRIVCTX(ctx)->rwlock);
 
 	if (rv) {
-		PKCS11err(PKCS11_F_PKCS11_RSA_DECRYPT, pkcs11_map_err(rv));
+		PKCS11err(PKCS11_F_PKCS11_RSA_DECRYPT, CKR_to_PKCS11(rv));
 		return -1;
 	}
 

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