OSSL3 API updates (#15)

open-quantum-safe · Mar 12, 2021 · afd8427 · afd8427
1 parent a13ddc8
commit afd8427
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/oqsprov/oqs_kem.c b/oqsprov/oqs_kem.c
@@ -77,13 +77,13 @@ static int oqs_kem_decapsencaps_init(void *vpkemctx, void *vkem, int operation)
     return 1;
 }
 
-static int oqs_kem_encaps_init(void *vpkemctx, void *vkem)
+static int oqs_kem_encaps_init(void *vpkemctx, void *vkem, const OSSL_PARAM params[])
 {
     OQS_KEM_PRINTF("OQS KEM provider called: encaps_init\n");
     return oqs_kem_decapsencaps_init(vpkemctx, vkem, EVP_PKEY_OP_ENCAPSULATE);
 }
 
-static int oqs_kem_decaps_init(void *vpkemctx, void *vkem)
+static int oqs_kem_decaps_init(void *vpkemctx, void *vkem, const OSSL_PARAM params[])
 {
     OQS_KEM_PRINTF("OQS KEM provider called: decaps_init\n");
     return oqs_kem_decapsencaps_init(vpkemctx, vkem, EVP_PKEY_OP_DECAPSULATE);

diff --git a/oqsprov/oqs_sig.c b/oqsprov/oqs_sig.c
@@ -236,13 +236,13 @@ static int oqs_sig_signverify_init(void *vpoqs_sigctx, void *voqssig, int operat
     return 1;
 }
 
-static int oqs_sig_sign_init(void *vpoqs_sigctx, void *voqssig)
+static int oqs_sig_sign_init(void *vpoqs_sigctx, void *voqssig, const OSSL_PARAM params[])
 {
     OQS_SIG_PRINTF("OQS SIG provider: sign_init called\n");
     return oqs_sig_signverify_init(vpoqs_sigctx, voqssig, EVP_PKEY_OP_SIGN);
 }
 
-static int oqs_sig_verify_init(void *vpoqs_sigctx, void *voqssig)
+static int oqs_sig_verify_init(void *vpoqs_sigctx, void *voqssig, const OSSL_PARAM params[])
 {
     OQS_SIG_PRINTF("OQS SIG provider: verify_init called\n");
     return oqs_sig_signverify_init(vpoqs_sigctx, voqssig, EVP_PKEY_OP_VERIFY);
@@ -334,13 +334,13 @@ static int oqs_sig_digest_signverify_init(void *vpoqs_sigctx, const char *mdname
 }
 
 static int oqs_sig_digest_sign_init(void *vpoqs_sigctx, const char *mdname,
-                                      void *voqssig)
+                                      void *voqssig, const OSSL_PARAM params[])
 {
     OQS_SIG_PRINTF("OQS SIG provider: digest_sign_init called\n");
     return oqs_sig_digest_signverify_init(vpoqs_sigctx, mdname, voqssig, EVP_PKEY_OP_SIGN);
 }
 
-static int oqs_sig_digest_verify_init(void *vpoqs_sigctx, const char *mdname, void *voqssig)
+static int oqs_sig_digest_verify_init(void *vpoqs_sigctx, const char *mdname, void *voqssig, const OSSL_PARAM params[])
 {
     OQS_SIG_PRINTF("OQS SIG provider: sig_digest_verify called\n");
     return oqs_sig_digest_signverify_init(vpoqs_sigctx, mdname, voqssig, EVP_PKEY_OP_VERIFY);

diff --git a/test/oqs_test_signatures.c b/test/oqs_test_signatures.c
@@ -48,12 +48,12 @@ static int test_oqs_signatures(const char *sigalg_name)
     && (ctx = EVP_PKEY_CTX_new_from_name(libctx, sigalg_name, NULL)) != NULL
     && EVP_PKEY_keygen_init(ctx)
     && EVP_PKEY_gen(ctx, &key)
-    && EVP_DigestSignInit_ex(mdctx, NULL, "SHA512", libctx, NULL, key)
+    && EVP_DigestSignInit_ex(mdctx, NULL, "SHA512", libctx, NULL, key, NULL)
     && EVP_DigestSignUpdate(mdctx, msg, sizeof(msg))
     && EVP_DigestSignFinal(mdctx, NULL, &siglen)
     && (sig = OPENSSL_malloc(siglen)) != NULL
     && EVP_DigestSignFinal(mdctx, sig, &siglen)
-    && EVP_DigestVerifyInit_ex(mdctx, NULL, "SHA512", libctx, NULL, key)
+    && EVP_DigestVerifyInit_ex(mdctx, NULL, "SHA512", libctx, NULL, key, NULL)
     && EVP_DigestVerifyUpdate(mdctx, msg, sizeof(msg))
     && EVP_DigestVerifyFinal(mdctx, sig, siglen);