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

Merge pull request #3574 from cconlon/releasefixes

Browse Source 
Release fixes for Jenkins tests, example client
This commit is contained in:
toddouska
2020-12-18 14:06:27 -08:00
committed by GitHub
parent cdc0753bfb e8785666c4
commit fe92d29eb5
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -3964,7 +3964,7 @@ fi
if test "$ENABLED_SIGNAL" = "yes" if test "$ENABLED_SIGNAL" = "yes"
then then
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SIGNAL" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SIGNAL -DWOLFSSL_AES_COUNTER -DWOLFSSL_AES_DIRECT"
# Requires opensslextra make sure on # Requires opensslextra make sure on
if test "x$ENABLED_OPENSSLEXTRA" = "xno" && test "x$ENABLED_OPENSSLCOEXIST" = "xno" if test "x$ENABLED_OPENSSLEXTRA" = "xno" && test "x$ENABLED_OPENSSLCOEXIST" = "xno"
then then
@ -6372,7 +6372,7 @@ fi
echo " * Async Crypto: $ENABLED_ASYNCCRYPT" echo " * Async Crypto: $ENABLED_ASYNCCRYPT"
echo " * PKCS#11: $ENABLED_PKCS11" echo " * PKCS#11: $ENABLED_PKCS11"
echo " * PKCS#12: $ENABLED_PKCS12" echo " * PKCS#12: $ENABLED_PKCS12"
echo " * Cavium Nitox: $ENABLED_CAVIUM" echo " * Cavium Nitrox: $ENABLED_CAVIUM"
echo " * Cavium Octeon (Sync): $ENABLED_OCTEON_SYNC" echo " * Cavium Octeon (Sync): $ENABLED_OCTEON_SYNC"
echo " * Intel Quick Assist: $ENABLED_INTEL_QA" echo " * Intel Quick Assist: $ENABLED_INTEL_QA"
echo " * ARM ASM: $ENABLED_ARMASM" echo " * ARM ASM: $ENABLED_ARMASM"

2
examples/client/client.c
View File

@ -2898,7 +2898,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
#endif #endif
#if defined(WOLFSSL_TLS13) && defined(HAVE_SUPPORTED_CURVES) #if defined(WOLFSSL_TLS13) && defined(HAVE_SUPPORTED_CURVES)
if (!helloRetry) { if (!helloRetry && version >= 4) {
#if defined(WOLFSSL_TLS13) && (!defined(NO_DH) || defined(HAVE_ECC) || \ #if defined(WOLFSSL_TLS13) && (!defined(NO_DH) || defined(HAVE_ECC) || \
defined(HAVE_CURVE25519) || defined(HAVE_CURVE448)) defined(HAVE_CURVE25519) || defined(HAVE_CURVE448))
if (onlyKeyShare == 0 || onlyKeyShare == 2) { if (onlyKeyShare == 0 || onlyKeyShare == 2) {

3
wolfcrypt/src/aes.c
View File

@ -8588,6 +8588,9 @@ static int wc_AesFeedbackCFB8(Aes* aes, byte* out, const byte* in,
} }
/* MSB + XOR */ /* MSB + XOR */
#ifdef BIG_ENDIAN_ORDER
ByteReverseWords(aes->tmp, aes->tmp, AES_BLOCK_SIZE);
#endif
out[0] = aes->tmp[0] ^ in[0]; out[0] = aes->tmp[0] ^ in[0];
if (dir == AES_ENCRYPTION) { if (dir == AES_ENCRYPTION) {
pt = (byte*)aes->reg; pt = (byte*)aes->reg;

15
wolfcrypt/src/curve25519.c
View File

@ -110,6 +110,12 @@ int wc_curve25519_generic(int public_size, byte* pub,
int basepoint_size, const byte* basepoint) { int basepoint_size, const byte* basepoint) {
int ret; int ret;
#ifdef FREESCALE_LTC_ECC
/* unsupported with NXP LTC, onlly supports single basepoint with
* nxp_ltc_curve25519_GetBasePoint() */
return WC_HW_E;
#endif
if ((public_size != CURVE25519_KEYSIZE) || if ((public_size != CURVE25519_KEYSIZE) ||
(private_size != CURVE25519_KEYSIZE) || (private_size != CURVE25519_KEYSIZE) ||
(basepoint_size != CURVE25519_KEYSIZE)) { (basepoint_size != CURVE25519_KEYSIZE)) {
@ -124,14 +130,6 @@ int wc_curve25519_generic(int public_size, byte* pub,
return ECC_BAD_ARG_E; return ECC_BAD_ARG_E;
} }
#ifdef FREESCALE_LTC_ECC
{
ECPoint wc_pub;
ret = nxp_ltc_curve25519(&wc_pub, priv, basepoint, basepoint);
if (ret == 0)
XMEMCPY(pub, wc_pub.point, CURVE25519_KEYSIZE);
}
#else
fe_init(); fe_init();
#if defined(USE_INTEL_SPEEDUP) || defined(WOLFSSL_ARMASM) #if defined(USE_INTEL_SPEEDUP) || defined(WOLFSSL_ARMASM)
@ -143,7 +141,6 @@ int wc_curve25519_generic(int public_size, byte* pub,
#if defined(USE_INTEL_SPEEDUP) || defined(WOLFSSL_ARMASM) #if defined(USE_INTEL_SPEEDUP) || defined(WOLFSSL_ARMASM)
RESTORE_VECTOR_REGISTERS(); RESTORE_VECTOR_REGISTERS();
#endif #endif
#endif
return ret; return ret;
} }