feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Changes that make kyber work on STM32

Browse Source 
(wolfcrypttest and benchmark)
This commit is contained in:
Anthony Hu
2023-02-24 04:04:33 -05:00
parent da04e0fb4c
commit 1fcff5b30d
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wolfcrypt/src/ext_kyber.c
View File

@ -25,6 +25,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#include <wolfssl/wolfcrypt/logging.h>
#ifdef WOLFSSL_HAVE_KYBER #ifdef WOLFSSL_HAVE_KYBER
#include <wolfssl/wolfcrypt/ext_kyber.h> #include <wolfssl/wolfcrypt/ext_kyber.h>
@ -304,8 +305,6 @@ int wc_KyberKey_SharedSecretSize(KyberKey* key, word32* len)
int wc_KyberKey_MakeKey(KyberKey* key, WC_RNG* rng) int wc_KyberKey_MakeKey(KyberKey* key, WC_RNG* rng)
{ {
int ret = 0; int ret = 0;
const char* algName = NULL;
OQS_KEM *kem = NULL;
(void)rng; (void)rng;
/* Validate parameter. */ /* Validate parameter. */
@ -314,6 +313,8 @@ int wc_KyberKey_MakeKey(KyberKey* key, WC_RNG* rng)
} }
#ifdef HAVE_LIBOQS #ifdef HAVE_LIBOQS
const char* algName = NULL;
OQS_KEM *kem = NULL;
if (ret == 0) { if (ret == 0) {
algName = OQS_ID2name(key->type); algName = OQS_ID2name(key->type);
if (algName == NULL) { if (algName == NULL) {
@ -339,6 +340,7 @@ int wc_KyberKey_MakeKey(KyberKey* key, WC_RNG* rng)
ret = BAD_FUNC_ARG; ret = BAD_FUNC_ARG;
} }
} }
OQS_KEM_free(kem);
#endif /* HAVE_LIBOQS */ #endif /* HAVE_LIBOQS */
#ifdef HAVE_PQM4 #ifdef HAVE_PQM4
if (ret == 0) { if (ret == 0) {
@ -353,8 +355,6 @@ int wc_KyberKey_MakeKey(KyberKey* key, WC_RNG* rng)
ForceZero(key, sizeof(*key)); ForceZero(key, sizeof(*key));
} }
OQS_KEM_free(kem);
return ret; return ret;
} }
@ -394,8 +394,6 @@ int wc_KyberKey_Encapsulate(KyberKey* key, unsigned char* ct, unsigned char* ss,
WC_RNG* rng) WC_RNG* rng)
{ {
int ret = 0; int ret = 0;
const char * algName = NULL;
OQS_KEM *kem = NULL;
(void)rng; (void)rng;
/* Validate parameters. */ /* Validate parameters. */
@ -404,6 +402,8 @@ int wc_KyberKey_Encapsulate(KyberKey* key, unsigned char* ct, unsigned char* ss,
} }
#ifdef HAVE_LIBOQS #ifdef HAVE_LIBOQS
const char * algName = NULL;
OQS_KEM *kem = NULL;
if (ret == 0) { if (ret == 0) {
algName = OQS_ID2name(key->type); algName = OQS_ID2name(key->type);
if (algName == NULL) { if (algName == NULL) {
@ -421,6 +421,8 @@ int wc_KyberKey_Encapsulate(KyberKey* key, unsigned char* ct, unsigned char* ss,
ret = BAD_FUNC_ARG; ret = BAD_FUNC_ARG;
} }
} }
OQS_KEM_free(kem);
#endif /* HAVE_LIBOQS */ #endif /* HAVE_LIBOQS */
#ifdef HAVE_PQM4 #ifdef HAVE_PQM4
if (ret == 0) { if (ret == 0) {
@ -431,8 +433,6 @@ int wc_KyberKey_Encapsulate(KyberKey* key, unsigned char* ct, unsigned char* ss,
} }
#endif /* HAVE_PQM4 */ #endif /* HAVE_PQM4 */
OQS_KEM_free(kem);
return ret; return ret;
} }
@ -477,9 +477,7 @@ int wc_KyberKey_Decapsulate(KyberKey* key, unsigned char* ss,
const unsigned char* ct, word32 len) const unsigned char* ct, word32 len)
{ {
int ret = 0; int ret = 0;
const char * algName = NULL;
word32 ctlen = 0; word32 ctlen = 0;
OQS_KEM *kem = NULL;
/* Validate parameters. */ /* Validate parameters. */
if ((key == NULL) || (ss == NULL) || (ct == NULL)) { if ((key == NULL) || (ss == NULL) || (ct == NULL)) {
@ -493,6 +491,8 @@ int wc_KyberKey_Decapsulate(KyberKey* key, unsigned char* ss,
} }
#ifdef HAVE_LIBOQS #ifdef HAVE_LIBOQS
const char * algName = NULL;
OQS_KEM *kem = NULL;
if (ret == 0) { if (ret == 0) {
algName = OQS_ID2name(key->type); algName = OQS_ID2name(key->type);
if (algName == NULL) { if (algName == NULL) {
@ -510,18 +510,18 @@ int wc_KyberKey_Decapsulate(KyberKey* key, unsigned char* ss,
ret = BAD_FUNC_ARG; ret = BAD_FUNC_ARG;
} }
} }
OQS_KEM_free(kem);
#endif /* HAVE_LIBOQS */ #endif /* HAVE_LIBOQS */
#ifdef HAVE_PQM4 #ifdef HAVE_PQM4
if (ret == 0) { if (ret == 0) {
if (crypto_kem_enc(ss, ct, key->priv) != 0) { if (crypto_kem_dec(ss, ct, key->priv) != 0) {
WOLFSSL_MSG("PQM4 Decapsulation failure."); WOLFSSL_MSG("PQM4 Decapsulation failure.");
ret = BAD_FUNC_ARG; ret = BAD_FUNC_ARG;
} }
} }
#endif /* HAVE_PQM4 */ #endif /* HAVE_PQM4 */
OQS_KEM_free(kem);
return ret; return ret;
} }

4
wolfssl/wolfcrypt/settings.h
View File

@ -2803,8 +2803,10 @@ extern void uITRON4_free(void *p) ;
#ifdef HAVE_PQM4 #ifdef HAVE_PQM4
#define HAVE_PQC #define HAVE_PQC
#define HAVE_KYBER #define WOLFSSL_HAVE_KYBER
#define WOLFSSL_KYBER512 #define WOLFSSL_KYBER512
#define WOLFSSL_NO_KYBER768
#define WOLFSSL_NO_KYBER1024
#endif #endif
#if defined(HAVE_PQC) && !defined(HAVE_LIBOQS) && !defined(HAVE_PQM4) && \ #if defined(HAVE_PQC) && !defined(HAVE_LIBOQS) && !defined(HAVE_PQM4) && \