Added SHA3x4 callbacks for liboqs.

Signed-off-by: David Dudas <david.dudas03@e-uvt.ro>

diff --git a/lib/dlwrap/oqsfuncs.h b/lib/dlwrap/oqsfuncs.h
index 8a09906ac90a2728f748421fa8256d3f5d15da5b..f40155f07444dffd4545e2e8779aa8c6c0f40824 100644 (file)
--- a/lib/dlwrap/oqsfuncs.h
+++ b/lib/dlwrap/oqsfuncs.h
@@ -17,9 +17,12 @@ VOID_FUNC(void, OQS_SHA2_set_callbacks, (struct OQS_SHA2_callbacks *new_callback
 VOID_FUNC(void, OQS_SHA3_set_callbacks, (struct OQS_SHA3_callbacks *new_callbacks), (new_callbacks))
 VOID_FUNC(void, OQS_SHA3_x4_set_callbacks, (struct OQS_SHA3_x4_callbacks *new_callbacks), (new_callbacks))
 FUNC(const char *, OQS_version, (void), ())
+FUNC(int, OQS_SIG_alg_is_enabled, (const char *method_name), (method_name))
 FUNC(OQS_SIG *, OQS_SIG_new, (const char *method_name), (method_name))
 FUNC(OQS_STATUS, OQS_SIG_keypair, (const OQS_SIG *sig, uint8_t *public_key, uint8_t *secret_key), (sig, public_key, secret_key))
 FUNC(OQS_STATUS, OQS_SIG_sign, (const OQS_SIG *sig, uint8_t *signature, size_t *signature_len, const uint8_t *message, size_t message_len, const uint8_t *secret_key), (sig, signature, signature_len, message, message_len, secret_key))
 FUNC(OQS_STATUS, OQS_SIG_verify, (const OQS_SIG *sig, const uint8_t *message, size_t message_len, const uint8_t *signature, size_t signature_len, const uint8_t *public_key), (sig, message, message_len, signature, signature_len, public_key))
 VOID_FUNC(void, OQS_SIG_free, (OQS_SIG *sig), (sig))
+VOID_FUNC(void, OQS_SHA2_set_callbacks, (struct OQS_SHA2_callbacks *new_callbacks), (new_callbacks))
 VOID_FUNC(void, OQS_SHA3_set_callbacks, (struct OQS_SHA3_callbacks *new_callbacks), (new_callbacks))
+VOID_FUNC(void, OQS_SHA3_x4_set_callbacks, (struct OQS_SHA3_x4_callbacks *new_callbacks), (new_callbacks))

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index a1751345660680a1a7a055169a44e2207f36b29a..027952eb3b63f71c5a5f1a574f8e2eb5f86f15f4 100644 (file)
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -908,10 +908,10 @@ typedef enum {
        GNUTLS_PK_ECDH_X448 = 11,
        GNUTLS_PK_EDDSA_ED448 = 12,
        GNUTLS_PK_RSA_OAEP = 13,
-       GNUTLS_PK_MLKEM768 = 15,
-       GNUTLS_PK_ML_DSA_44 = 16,
-       GNUTLS_PK_ML_DSA_65 = 17,
-       GNUTLS_PK_ML_DSA_87 = 18,
+       GNUTLS_PK_MLKEM768 = 14,
+       GNUTLS_PK_ML_DSA_44 = 15,
+       GNUTLS_PK_ML_DSA_65 = 16,
+       GNUTLS_PK_ML_DSA_87 = 17,
        GNUTLS_PK_MAX = GNUTLS_PK_ML_DSA_87,
 
        /* Experimental algorithms */

diff --git a/lib/nettle/pk.c b/lib/nettle/pk.c
index 43e3f4ff4b532be9c621de3d7f509ac648e1e6ac..9ceceeab2b3bc76c220dd50ea3bd8bc08c5bca03 100644 (file)
--- a/lib/nettle/pk.c
+++ b/lib/nettle/pk.c
@@ -2557,8 +2557,7 @@ static int _wrap_nettle_pk_exists(gnutls_pk_algorithm_t pk)
        case GNUTLS_PK_EXP_SPHINCS_SHAKE_192F:
        case GNUTLS_PK_EXP_SPHINCS_SHAKE_192S:
        case GNUTLS_PK_EXP_SPHINCS_SHAKE_256F:
-       case GNUTLS_PK_EXP_SPHINCS_SHAKE_256S:
-       {
+       case GNUTLS_PK_EXP_SPHINCS_SHAKE_256S: {
                const char *algo_name;
 
                if (_gnutls_liboqs_ensure() < 0)
@@ -4387,6 +4386,7 @@ static int wrap_nettle_pk_verify_priv_params(gnutls_pk_algorithm_t algo,
 
                ret = 0;
                break;
+       }
        case GNUTLS_PK_ML_DSA_44:
        case GNUTLS_PK_ML_DSA_65:
        case GNUTLS_PK_ML_DSA_87: