Skip to content

Commit 480a70d

Browse files
authored
Merge pull request #25 from bandi13/enableAllCrypto
Enable all crypto + test fixes
2 parents b00e8da + 5972a90 commit 480a70d

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

scripts/utils-wolfssl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ install_wolfssl() {
5959
if [ ! -d ${WOLFSSL_INSTALL_DIR} ]; then
6060
printf "\tConfigure wolfSSL ${WOLFSSL_TAG} ... "
6161
if [ -z "$WOLFSSL_CONFIG_OPTS" ]; then
62-
WOLFSSL_CONFIG_OPTS='--with-max-ecc-bits=1024 --enable-opensslcoexist --enable-cmac --enable-keygen --enable-sha --enable-aesctr --enable-aesccm --enable-x963kdf --enable-compkey --enable-certgen --enable-aeskeywrap --enable-enckeys --enable-base16 --enable-aesgcm-stream --enable-curve25519 --enable-curve448 --enable-ed25519 --enable-ed448 --enable-pwdbased'
62+
WOLFSSL_CONFIG_OPTS='--enable-all-crypto --with-max-ecc-bits=1024 --enable-opensslcoexist --enable-cmac --enable-keygen --enable-sha --enable-aesctr --enable-aesccm --enable-x963kdf --enable-compkey --enable-certgen --enable-aeskeywrap --enable-enckeys --enable-base16 --enable-aesgcm-stream --enable-curve25519 --enable-curve448 --enable-ed25519 --enable-ed448 --enable-pwdbased'
6363
WOLFSSL_CONFIG_CFLAGS="-I${OPENSSL_INSTALL_DIR}/include -DHAVE_AES_ECB -DWOLFSSL_AES_DIRECT -DWC_RSA_NO_PADDING -DWOLFSSL_PUBLIC_MP -DECC_MIN_KEY_SZ=192 -DHAVE_PUBLIC_FFDHE -DHAVE_FFDHE_6144 -DHAVE_FFDHE_8192 -DWOLFSSL_DH_EXTRA -DWOLFSSL_PSS_LONG_SALT -DWOLFSSL_PSS_SALT_LEN_DISCOVER"
6464
fi
6565

test/test_hkdf.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ static int test_hkdf_hexstr_calc(OSSL_LIB_CTX* libCtx, unsigned char *key,
199199
{
200200
int err = 0;
201201
EVP_PKEY_CTX *ctx = NULL;
202-
const char* inKey = "00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00";
203-
const char* salt = "00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00";
204-
const char* info = "00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00";
202+
const char* inKey = "00000000000000000000000000000000";
203+
const char* salt = "00000000000000000000000000000000";
204+
const char* info = "00000000000000000000000000000000";
205205
size_t len = keyLen;
206206

207207
if (strncmp("EXTRACT_ONLY", mode, 12) == 0) {

test/test_tls1_prf.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ static int test_tls1_prf_hexstr_calc(OSSL_LIB_CTX* libCtx, unsigned char *key,
180180
{
181181
int err = 0;
182182
EVP_PKEY_CTX *ctx = NULL;
183-
const char* secret = "00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00";
184-
const char* label = "31:32:33:34:34:35:36";
185-
const char* seed = "00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00";
183+
const char* secret = "00000000000000000000000000000000";
184+
const char* label = "31323334343536";
185+
const char* seed = "00000000000000000000000000000000";
186186
size_t len = keyLen;
187187

188188
ctx = EVP_PKEY_CTX_new_from_name(libCtx, "TLS1-PRF", NULL);

0 commit comments

Comments
 (0)