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

remove rc4 from default build

Browse Source
This commit is contained in:
toddouska
2015-03-27 10:17:22 -07:00
parent e4ac398d98
commit d655fb9d74
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -995,7 +995,7 @@ AM_CONDITIONAL([BUILD_DES3], [test "x$ENABLED_DES3" = "xyes"])
AC_ARG_ENABLE([arc4], AC_ARG_ENABLE([arc4],
[ --enable-arc4 Enable ARC4 (default: enabled)], [ --enable-arc4 Enable ARC4 (default: enabled)],
[ ENABLED_ARC4=$enableval ], [ ENABLED_ARC4=$enableval ],
[ ENABLED_ARC4=yes ] [ ENABLED_ARC4=no ]
) )
if test "$ENABLED_ARC4" = "no" if test "$ENABLED_ARC4" = "no"

4
src/ssl.c
View File

@ -7675,6 +7675,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
} }
} }
#endif /* NO_DES3 */ #endif /* NO_DES3 */
#ifndef NO_RC4
else if (ctx->cipherType == ARC4_TYPE || (type && else if (ctx->cipherType == ARC4_TYPE || (type &&
XSTRNCMP(type, "ARC4", 4) == 0)) { XSTRNCMP(type, "ARC4", 4) == 0)) {
WOLFSSL_MSG("ARC4"); WOLFSSL_MSG("ARC4");
@ -7684,6 +7685,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
if (key) if (key)
wc_Arc4SetKey(&ctx->cipher.arc4, key, ctx->keyLen); wc_Arc4SetKey(&ctx->cipher.arc4, key, ctx->keyLen);
} }
#endif /* NO_RC4 */
else if (ctx->cipherType == NULL_CIPHER_TYPE || (type && else if (ctx->cipherType == NULL_CIPHER_TYPE || (type &&
XSTRNCMP(type, "NULL", 4) == 0)) { XSTRNCMP(type, "NULL", 4) == 0)) {
WOLFSSL_MSG("NULL cipher"); WOLFSSL_MSG("NULL cipher");
@ -7779,9 +7781,11 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
break; break;
#endif #endif
#ifndef NO_RC4
case ARC4_TYPE : case ARC4_TYPE :
wc_Arc4Process(&ctx->cipher.arc4, dst, src, len); wc_Arc4Process(&ctx->cipher.arc4, dst, src, len);
break; break;
#endif
case NULL_CIPHER_TYPE : case NULL_CIPHER_TYPE :
XMEMCPY(dst, src, len); XMEMCPY(dst, src, len);

2
wolfcrypt/src/arc4.c
View File

@ -174,5 +174,5 @@ static void wc_Arc4CaviumProcess(Arc4* arc4, byte* out, const byte* in,
#endif /* HAVE_CAVIUM */ #endif /* HAVE_CAVIUM */
#endif /* NO_ARC4 */ #endif /* NO_RC4 */