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

Jenkins PRB enable options test

Browse Source
This commit is contained in:
Tesfa Mael
2019-08-26 15:43:58 -07:00
parent 9b3fee223f
commit b2555d38bc
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ssl.c
View File

@@ -13805,6 +13805,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
case EVP_CTRL_SET_KEY_LENGTH: case EVP_CTRL_SET_KEY_LENGTH:
ret = wolfSSL_EVP_CIPHER_CTX_set_key_length(ctx, arg); ret = wolfSSL_EVP_CIPHER_CTX_set_key_length(ctx, arg);
break; break;
#ifdef HAVE_AESGCM
case EVP_CTRL_GCM_SET_IVLEN: case EVP_CTRL_GCM_SET_IVLEN:
if(arg <= 0 || arg > 16) if(arg <= 0 || arg > 16)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
@@ -13826,6 +13827,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
XMEMCPY(ptr, ctx->authTag, arg); XMEMCPY(ptr, ctx->authTag, arg);
ret = WOLFSSL_SUCCESS; ret = WOLFSSL_SUCCESS;
break; break;
#endif /* HAVE_AESGCM */
default: default:
WOLFSSL_MSG("EVP_CIPHER_CTX_ctrl operation not yet handled"); WOLFSSL_MSG("EVP_CIPHER_CTX_ctrl operation not yet handled");
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;

3
wolfcrypt/src/evp.c
View File

@@ -356,6 +356,7 @@ static int evpCipherBlock(WOLFSSL_EVP_CIPHER_CTX *ctx,
return WOLFSSL_SUCCESS; /* success */ return WOLFSSL_SUCCESS; /* success */
} }
#if defined(HAVE_AESGCM)
static int wolfSSL_EVP_CipherUpdate_GCM(WOLFSSL_EVP_CIPHER_CTX *ctx, static int wolfSSL_EVP_CipherUpdate_GCM(WOLFSSL_EVP_CIPHER_CTX *ctx,
unsigned char *out, int *outl, unsigned char *out, int *outl,
const unsigned char *in, int inl) const unsigned char *in, int inl)
@@ -366,6 +367,8 @@ static int wolfSSL_EVP_CipherUpdate_GCM(WOLFSSL_EVP_CIPHER_CTX *ctx,
*outl = inl; *outl = inl;
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#endif
WOLFSSL_API int wolfSSL_EVP_CipherUpdate(WOLFSSL_EVP_CIPHER_CTX *ctx, WOLFSSL_API int wolfSSL_EVP_CipherUpdate(WOLFSSL_EVP_CIPHER_CTX *ctx,
unsigned char *out, int *outl, unsigned char *out, int *outl,
const unsigned char *in, int inl) const unsigned char *in, int inl)

2
wolfssl/openssl/evp.h
View File

@@ -653,8 +653,6 @@ typedef WOLFSSL_EVP_CIPHER_CTX EVP_CIPHER_CTX;
#define EVP_CTRL_GCM_SET_IVLEN EVP_CTRL_AEAD_SET_IVLEN #define EVP_CTRL_GCM_SET_IVLEN EVP_CTRL_AEAD_SET_IVLEN
#define EVP_CTRL_GCM_GET_TAG EVP_CTRL_AEAD_GET_TAG #define EVP_CTRL_GCM_GET_TAG EVP_CTRL_AEAD_GET_TAG
#define EVP_CTRL_GCM_SET_TAG EVP_CTRL_AEAD_SET_TAG #define EVP_CTRL_GCM_SET_TAG EVP_CTRL_AEAD_SET_TAG
#define EVP_CTRL_GCM_SET_IV_FIXED EVP_CTRL_AEAD_SET_IV_FIXED
#define EVP_CTRL_GCM_IV_GEN 0x13
#ifndef EVP_MAX_MD_SIZE #ifndef EVP_MAX_MD_SIZE
#define EVP_MAX_MD_SIZE 64 /* sha512 */ #define EVP_MAX_MD_SIZE 64 /* sha512 */