wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 12:44:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix OPENSSL_EXTRA + NO_DES3 build

Browse Source
This commit is contained in:
Chris Conlon
2015-03-20 10:59:54 -06:00
parent 2e7d3a9121
commit 6c963c8d8e
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ssl.c
View File

@@ -2464,6 +2464,7 @@ static int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff,
(byte*)password, passwordSz, 1, key, iv)) <= 0) {
/* empty */
}
#ifndef NO_DES3
else if (XSTRNCMP(info->name, "DES-CBC", 7) == 0) {
ret = wc_Des_CbcDecryptWithKey(der.buffer, der.buffer, der.length,
key, info->iv);
@@ -2472,6 +2473,7 @@ static int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff,
ret = wc_Des3_CbcDecryptWithKey(der.buffer, der.buffer, der.length,
key, info->iv);
}
#endif
else if (XSTRNCMP(info->name, "AES-128-CBC", 13) == 0) {
ret = wc_AesCbcDecryptWithKey(der.buffer, der.buffer, der.length,
key, AES_128_KEY_SIZE, info->iv);
@@ -7608,6 +7610,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
}
}
#endif /* WOLFSSL_AES_CTR */
#ifndef NO_DES3
else if (ctx->cipherType == DES_CBC_TYPE || (type &&
XSTRNCMP(type, "DES-CBC", 7) == 0)) {
WOLFSSL_MSG("DES-CBC");
@@ -7645,6 +7648,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
return ret;
}
}
#endif /* NO_DES3 */
else if (ctx->cipherType == ARC4_TYPE || (type &&
XSTRNCMP(type, "ARC4", 4) == 0)) {
WOLFSSL_MSG("ARC4");
@@ -7731,6 +7735,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
break;
#endif
#ifndef NO_DES3
case DES_CBC_TYPE :
if (ctx->enc)
wc_Des_CbcEncrypt(&ctx->cipher.des, dst, src, len);
@@ -7744,6 +7749,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
else
ret = wc_Des3_CbcDecrypt(&ctx->cipher.des3, dst, src, len);
break;
#endif
case ARC4_TYPE :
wc_Arc4Process(&ctx->cipher.arc4, dst, src, len);
@@ -7797,6 +7803,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
break;
#endif
#ifndef NO_DES3
case DES_CBC_TYPE :
WOLFSSL_MSG("DES CBC");
memcpy(ctx->iv, &ctx->cipher.des.reg, DES_BLOCK_SIZE);
@@ -7806,6 +7813,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
WOLFSSL_MSG("DES EDE3 CBC");
memcpy(ctx->iv, &ctx->cipher.des.reg, DES_BLOCK_SIZE);
break;
#endif
case ARC4_TYPE :
WOLFSSL_MSG("ARC4");
@@ -7853,6 +7861,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
break;
#endif
#ifndef NO_DES3
case DES_CBC_TYPE :
WOLFSSL_MSG("DES CBC");
memcpy(&ctx->cipher.des.reg, ctx->iv, DES_BLOCK_SIZE);
@@ -7862,6 +7871,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
WOLFSSL_MSG("DES EDE3 CBC");
memcpy(&ctx->cipher.des.reg, ctx->iv, DES_BLOCK_SIZE);
break;
#endif
case ARC4_TYPE :
WOLFSSL_MSG("ARC4");
@@ -8059,6 +8069,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
}
#ifndef NO_DES3
/* SSL_SUCCESS on ok */
int wolfSSL_DES_key_sched(WOLFSSL_const_DES_cblock* key,
WOLFSSL_DES_key_schedule* schedule)
@@ -8109,6 +8120,8 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
XMEMCPY(ivec, output + length - sizeof(DES_cblock), sizeof(DES_cblock));
}
#endif /* NO_DES3 */
void wolfSSL_ERR_free_strings(void)
{
@@ -10122,6 +10135,7 @@ long wolfSSL_CTX_sess_number(WOLFSSL_CTX* ctx)
return 0;
}
#ifndef NO_DES3
void wolfSSL_DES_set_key_unchecked(WOLFSSL_const_DES_cblock* myDes,
WOLFSSL_DES_key_schedule* key)
@@ -10146,6 +10160,8 @@ void wolfSSL_DES_ecb_encrypt(WOLFSSL_DES_cblock* desa,
(void)len;
}
#endif /* NO_DES3 */
int wolfSSL_BIO_printf(WOLFSSL_BIO* bio, const char* format, ...)
{
(void)bio;
@@ -11941,6 +11957,8 @@ int wolfSSL_EVP_X_STATE_LEN(const WOLFSSL_EVP_CIPHER_CTX* ctx)
}
#ifndef NO_DES3
void wolfSSL_3des_iv(WOLFSSL_EVP_CIPHER_CTX* ctx, int doset,
unsigned char* iv, int len)
{
@@ -11959,6 +11977,8 @@ void wolfSSL_3des_iv(WOLFSSL_EVP_CIPHER_CTX* ctx, int doset,
memcpy(iv, &ctx->cipher.des3.reg, DES_BLOCK_SIZE);
}
#endif /* NO_DES3 */
void wolfSSL_aes_ctr_iv(WOLFSSL_EVP_CIPHER_CTX* ctx, int doset,
unsigned char* iv, int len)

3
wolfcrypt/test/test.c
View File

@@ -4510,6 +4510,7 @@ int openssl_test(void)
if (memcmp(hash, c.output, MD5_DIGEST_SIZE) != 0)
return -74;
#ifndef NO_DES3
{ /* des test */
const byte vector[] = { /* "now is the time for all " w/o trailing 0 */
0x6e,0x6f,0x77,0x20,0x69,0x73,0x20,0x74,
@@ -4559,6 +4560,8 @@ int openssl_test(void)
} /* end des test */
#endif /* NO_DES3 */
{ /* evp_cipher test */
EVP_CIPHER_CTX ctx;

3
wolfssl/openssl/des.h
View File

@@ -30,6 +30,8 @@
#include <wolfssl/wolfcrypt/settings.h>
#ifndef NO_DES3
#ifdef WOLFSSL_PREFIX
#include "prefix_des.h"
#endif
@@ -99,5 +101,6 @@ do { \
} /* extern "C" */
#endif
#endif /* NO_DES3 */
#endif /* WOLFSSL_DES_H_ */