Test operations with pem keys

.reuse/dep5

@@ -25,6 +25,7 @@ Files: .github/*
        docs/*
        tests/lsan.supp
        tools/openssl*.cnf
+       tests/*.pem
 Copyright: (C) 2022 Simo Sorce <[email protected]>
 License: Apache-2.0
 

src/objects.c

@@ -2762,7 +2762,7 @@ static CK_RV return_dup_key(P11PROV_OBJ *dst, P11PROV_OBJ *src)
     dst->cka_token = src->cka_token;
     dst->data.key = src->data.key;
 
-    dst->attrs = OPENSSL_malloc(sizeof(CK_ATTRIBUTE) * src->numattrs);
+    dst->attrs = OPENSSL_zalloc(sizeof(CK_ATTRIBUTE) * src->numattrs);
     if (!dst->attrs) {
         rv = CKR_HOST_MEMORY;
         P11PROV_raise(dst->ctx, rv, "Failed allocation");

src/util.c

@@ -1016,8 +1016,10 @@ CK_RV p11prov_copy_attr(CK_ATTRIBUTE *dst, CK_ATTRIBUTE *src)
             return CKR_HOST_MEMORY;
         }
         memcpy(dst->pValue, src->pValue, src->ulValueLen);
-        dst->ulValueLen = src->ulValueLen;
+    } else {
+        dst->pValue = NULL;
     }
+    dst->ulValueLen = src->ulValueLen;
     dst->type = src->type;
 
     return CKR_OK;

tests/helpers.sh

@@ -23,6 +23,9 @@ title()
         shift 1
         echo ""
         echo "## $*"
+        if [ -f "${PPDBGFILE}" ]; then
+            echo "[TEST]: $*" >> "${PPDBGFILE}"
+        fi
         ;;
     "LINE")
         shift 1

tests/setup-kryoptic.sh

@@ -403,6 +403,7 @@ title LINE "Export test variables to ${TMPPDIR}/testvars"
 cat >> "${TMPPDIR}/testvars" <<DBGSCRIPT
 export P11LIB=${P11LIB}
 export PKCS11_PROVIDER_MODULE=${P11LIB}
+export PPDBGFILE=${TMPPDIR}/p11prov-debug.log
 export PKCS11_PROVIDER_DEBUG="file:${TMPPDIR}/p11prov-debug.log"
 export OPENSSL_CONF="${OPENSSL_CONF}"
 export KRYOPTIC_CONF="${TMPPDIR}/tokens/kryoptic.sql"

tests/setup-softhsm.sh

@@ -395,6 +395,7 @@ title LINE "Export test variables to ${TMPPDIR}/testvars"
 cat >> "${TMPPDIR}/testvars" <<DBGSCRIPT
 export P11LIB=${P11LIB}
 export PKCS11_PROVIDER_MODULE=${P11LIB}
+export PPDBGFILE=${TMPPDIR}/p11prov-debug.log
 export PKCS11_PROVIDER_DEBUG="file:${TMPPDIR}/p11prov-debug.log"
 export OPENSSL_CONF="${OPENSSL_CONF}"
 export SOFTHSM2_CONF=${TMPPDIR}/softhsm.conf

tests/setup-softokn.sh

@@ -173,6 +173,7 @@ sed -e "s|@libtoollibs@|${LIBSPATH}|g" \
 
 title LINE "Export tests variables to ${TMPPDIR}/testvars"
 cat > "${TMPPDIR}/testvars" <<DBGSCRIPT
+export PPDBGFILE=${TMPPDIR}/p11prov-debug.log
 export PKCS11_PROVIDER_DEBUG="file:${TMPPDIR}/p11prov-debug.log"
 export PKCS11_PROVIDER_MODULE="${SOFTOKNPATH%%/}/libsoftokn3${SHARED_EXT}"
 export OPENSSL_CONF="${OPENSSL_CONF}"

tests/tecdh

@@ -10,4 +10,31 @@ pkeyutl -derive -inkey ${ECBASEURI}
                 -peerkey ${ECPEERPUBURI}
                 -out ${TMPPDIR}/secret.ecdh.bin'
 
+
+# Now test by forcing all operations on the token
+title PARA "ECDH Exchange forcing PKCS11 Provider"
+ORIG_OPENSSL_CONF=${OPENSSL_CONF}
+sed -e "s/#MORECONF/alg_section = algorithm_sec\n\n[algorithm_sec]\ndefault_properties = ?provider=pkcs11/" \
+    "${OPENSSL_CONF}" > "${OPENSSL_CONF}.forcetoken"
+OPENSSL_CONF=${OPENSSL_CONF}.forcetoken
+title PARA "ECDH Exchange forced: public key in file"
+ossl '
+pkeyutl -derive -inkey ${ECBASEURI}
+                -peerkey ${TESTSSRCDIR}/testp256.pub.pem
+                -out ${TMPPDIR}/forced.pub.ecdh.bin'
+
+### Private EC Key import not supported yet
+#title PARA "ECDH Exchange forced: private key in file"
+#ossl '
+#pkeyutl -derive -inkey ${TESTSSRCDIR}/testp256.pri.pem
+#                -peerkey ${ECPEERPUBURI}
+#                -out ${TMPPDIR}/forced.pri.ecdh.bin'
+
+#title PARA "ECDH Exchange forced: both key in file"
+#ossl '
+#pkeyutl -derive -inkey ${TESTSSRCDIR}/testp256.pri.pem
+#                -peerkey ${TESTSSRCDIR}/testp256.pub.pem
+#                -out ${TMPPDIR}/forced.both.ecdh.bin'
+OPENSSL_CONF=${ORIG_OPENSSL_CONF}
+
 exit 0

tests/testp256.pri.pem

@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgQj80pwUNIHHjzQaJ
+yP+vAPE8KPBmrVwafor5xar9sq+hRANCAATXOFIB00W2LsAwzDxBpg/uFzFu4uIK
+5otxalZiroOusrSBYA/vS2MC/6vaR+zrdnxRlYoHIbhe7H+PlEHPuq/a
+-----END PRIVATE KEY-----

tests/testp256.pub.pem

@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE1zhSAdNFti7AMMw8QaYP7hcxbuLi
+CuaLcWpWYq6DrrK0gWAP70tjAv+r2kfs63Z8UZWKByG4Xux/j5RBz7qv2g==
+-----END PUBLIC KEY-----