pkcs11-tool.c - acceept ECPOINT as OCTET STRING or BIT STRING

 Changes to be committed:
	modified:   tools/pkcs11-tool.c

Author: dengert

src/tools/pkcs11-tool.c

@@ -6332,9 +6332,14 @@ static int read_object(CK_SESSION_HANDLE session)
 
 			value = getEC_POINT(session, obj, &len);
 			/* PKCS#11-compliant modules should return ASN1_OCTET_STRING */
-			/* TODO DEE Should be returned encoded in BIT STRING, Need to accept both */
+			/* DEE Should be returned encoded in BIT STRING, Need to accept both */
 			a = value;
 			os = d2i_ASN1_OCTET_STRING(NULL, &a, (long)len);
+			if (!os) {
+				os = d2i_ASN1_BIT_STRING(NULL, &a, (long)&len);
+				len = (len + 7) / 8;
+			}
+			
 #if OPENSSL_VERSION_NUMBER < 0x30000000L
 			group = EC_KEY_get0_group(EVP_PKEY_get0_EC_KEY(pkey));
 #else
@@ -6439,7 +6444,7 @@ static int read_object(CK_SESSION_HANDLE session)
 
 			value = getEC_POINT(session, obj, &len);
 			/* PKCS#11-compliant modules should return ASN1_OCTET_STRING */
-			/* TODO DEE should be in BIT STRING accept both */
+			/* DEE should be in BIT STRING accept both */
 			a = value;
 			os = d2i_ASN1_OCTET_STRING(NULL, &a, (long)len);
 			if (!os) {