1. Updated sniffer to allow DES3 to be disabled.
2. Fixed an unused variable in OpenSSL Extras when DES3 is disabled. 3. Force DES3 enabled when enabling MCAPI.
This commit is contained in:
parent
e92f0e32b0
commit
bad6be5c76
@ -2873,6 +2873,9 @@ AS_IF([test "x$ENABLED_CMAC" = "xyes" && \
|
||||
# Update CFLAGS based on options #
|
||||
################################################################################
|
||||
|
||||
AS_IF([test "x$ENABLED_MCAPI" = "xyes"],
|
||||
[AS_IF([test "x$ENABLED_DES3" = "xno"],[ENABLED_DES3="yes"])])
|
||||
|
||||
if test "$ENABLED_WOLFSCEP" = "yes"
|
||||
then
|
||||
# Enable prereqs if not already enabled
|
||||
|
@ -1947,6 +1947,10 @@ static int Decrypt(SSL* ssl, byte* output, const byte* input, word32 sz)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
(void)output;
|
||||
(void)input;
|
||||
(void)sz;
|
||||
|
||||
switch (ssl->specs.bulk_cipher_algorithm) {
|
||||
#ifdef BUILD_ARC4
|
||||
case wolfssl_rc4:
|
||||
@ -2687,14 +2691,20 @@ static int FindNextRecordInAssembly(SnifferSession* session,
|
||||
return 0;
|
||||
}
|
||||
else if (ssl->specs.cipher_type == block) {
|
||||
if (ssl->specs.bulk_cipher_algorithm == wolfssl_aes)
|
||||
if (ssl->specs.bulk_cipher_algorithm == wolfssl_aes) {
|
||||
#ifdef BUILD_AES
|
||||
wc_AesSetIV(ssl->decrypt.aes,
|
||||
curr->data + curr->end - curr->begin
|
||||
- ssl->specs.block_size + 1);
|
||||
else if (ssl->specs.bulk_cipher_algorithm == wolfssl_triple_des)
|
||||
#endif
|
||||
}
|
||||
else if (ssl->specs.bulk_cipher_algorithm == wolfssl_triple_des) {
|
||||
#ifdef BUILD_DES3
|
||||
wc_Des3_SetIV(ssl->decrypt.des3,
|
||||
curr->data + curr->end - curr->begin
|
||||
- ssl->specs.block_size + 1);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
Trace(DROPPING_LOST_FRAG_STR);
|
||||
|
@ -9814,6 +9814,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
|
||||
{
|
||||
int ret = -1; /* failure local, during function 0 means success
|
||||
because internal functions work that way */
|
||||
(void)key;
|
||||
(void)iv;
|
||||
(void)enc;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user