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

Merge pull request #1492 from dgarske/fix_noasn_pwdbased

Browse Source 
Fixes for ASN disabled and PWDBASED enabled / Win FIPS
This commit is contained in:
toddouska
2018-04-11 12:09:30 -07:00
committed by GitHub
parent e25da80766 83bfdb1594
commit d85580691b
9 changed files with 139 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wolfcrypt/src/evp.c
View File

@@ -449,7 +449,7 @@ WOLFSSL_API int wolfSSL_EVP_CIPHER_CTX_block_size(const WOLFSSL_EVP_CIPHER_CTX *
{ {
if (ctx == NULL) return BAD_FUNC_ARG; if (ctx == NULL) return BAD_FUNC_ARG;
switch (ctx->cipherType) { switch (ctx->cipherType) {
#if !defined(NO_AES) || !defined(NO_DES3)
#if !defined(NO_AES) && defined(HAVE_AES_CBC) #if !defined(NO_AES) && defined(HAVE_AES_CBC)
case AES_128_CBC_TYPE: case AES_128_CBC_TYPE:
case AES_192_CBC_TYPE: case AES_192_CBC_TYPE:
@@ -472,6 +472,7 @@ WOLFSSL_API int wolfSSL_EVP_CIPHER_CTX_block_size(const WOLFSSL_EVP_CIPHER_CTX *
case DES_EDE3_ECB_TYPE: case DES_EDE3_ECB_TYPE:
#endif #endif
return ctx->block_size; return ctx->block_size;
#endif /* !NO_AES || !NO_DES3 */
default: default:
return 0; return 0;
} }

56
wolfcrypt/src/hash.c
View File

@@ -48,6 +48,62 @@ enum Hash_Sum {
}; };
#endif /* !NO_ASN */ #endif /* !NO_ASN */
/* function converts int hash type to enum */
enum wc_HashType wc_HashTypeConvert(int hashType)
{
/* Default to hash type none as error */
enum wc_HashType eHashType = WC_HASH_TYPE_NONE;
#ifdef HAVE_FIPS
/* original FIPSv1 requires a mapping for unique hash type to wc_HashType */
switch (hashType) {
#ifndef NO_MD5
case WC_MD5:
eHashType = WC_HASH_TYPE_MD5;
break;
#endif /* !NO_MD5 */
#ifndef NO_SHA
case WC_SHA:
eHashType = WC_HASH_TYPE_SHA;
break;
#endif /* !NO_SHA */
#ifdef WOLFSSL_SHA224
case WC_SHA224:
eHashType = WC_HASH_TYPE_SHA224;
break;
#endif /* WOLFSSL_SHA224 */
#ifndef NO_SHA256
case WC_SHA256:
eHashType = WC_HASH_TYPE_SHA256;
break;
#endif /* !NO_SHA256 */
#ifdef WOLFSSL_SHA512
#ifdef WOLFSSL_SHA384
case WC_SHA384:
eHashType = WC_HASH_TYPE_SHA384;
break;
#endif /* WOLFSSL_SHA384 */
case WC_SHA512:
eHashType = WC_HASH_TYPE_SHA512;
break;
#endif /* WOLFSSL_SHA512 */
default:
eHashType = WC_HASH_TYPE_NONE;
break;
}
#else
/* current master uses same unique types as wc_HashType */
if (hashType > 0 && hashType <= WC_HASH_TYPE_MAX) {
eHashType = (enum wc_HashType)hashType;
}
#endif
return eHashType;
}
int wc_HashGetOID(enum wc_HashType hash_type) int wc_HashGetOID(enum wc_HashType hash_type)
{ {
int oid = HASH_TYPE_E; /* Default to hash type error */ int oid = HASH_TYPE_E; /* Default to hash type error */

24
wolfcrypt/src/pwdbased.c
View File

@@ -62,15 +62,14 @@ int wc_PBKDF1_ex(byte* key, int keyLen, byte* iv, int ivLen,
(void)heap; (void)heap;
if (key == NULL || keyLen < 0 || passwdLen < 0 || saltLen < 0 || if (key == NULL || keyLen < 0 || passwdLen < 0 || saltLen < 0 || ivLen < 0){
ivLen < 0 || hashType < 0 || hashType > WC_HASH_TYPE_MAX) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
if (iterations <= 0) if (iterations <= 0)
iterations = 1; iterations = 1;
hashT = (enum wc_HashType)hashType; hashT = wc_HashTypeConvert(hashType);
err = wc_HashGetDigestSize(hashT); err = wc_HashGetDigestSize(hashT);
if (err < 0) if (err < 0)
return err; return err;
@@ -180,16 +179,14 @@ int wc_PBKDF2(byte* output, const byte* passwd, int pLen, const byte* salt,
#endif #endif
enum wc_HashType hashT; enum wc_HashType hashT;
if (output == NULL || pLen < 0 || sLen < 0 || kLen < 0 || if (output == NULL || pLen < 0 || sLen < 0 || kLen < 0) {
hashType < 0 || hashType > WC_HASH_TYPE_MAX) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
if (iterations <= 0) if (iterations <= 0)
iterations = 1; iterations = 1;
hashT = (enum wc_HashType)hashType; hashT = wc_HashTypeConvert(hashType);
hLen = wc_HashGetDigestSize(hashT); hLen = wc_HashGetDigestSize(hashT);
if (hLen < 0) if (hLen < 0)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@@ -205,7 +202,8 @@ int wc_PBKDF2(byte* output, const byte* passwd, int pLen, const byte* salt,
ret = wc_HmacInit(hmac, NULL, INVALID_DEVID); ret = wc_HmacInit(hmac, NULL, INVALID_DEVID);
if (ret == 0) { if (ret == 0) {
ret = wc_HmacSetKey(hmac, hashT, passwd, pLen); /* use int hashType here, since HMAC FIPS uses the old unique value */
ret = wc_HmacSetKey(hmac, hashType, passwd, pLen);
while (ret == 0 && kLen) { while (ret == 0 && kLen) {
int currentLen; int currentLen;
@@ -276,12 +274,11 @@ static int DoPKCS12Hash(int hashType, byte* buffer, word32 totalLen,
#endif #endif
enum wc_HashType hashT; enum wc_HashType hashT;
if (buffer == NULL || Ai == NULL || hashType < 0 || if (buffer == NULL || Ai == NULL) {
hashType > WC_HASH_TYPE_MAX) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
hashT = (enum wc_HashType)hashType; hashT = wc_HashTypeConvert(hashType);
/* initialize hash */ /* initialize hash */
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -357,15 +354,14 @@ int wc_PKCS12_PBKDF_ex(byte* output, const byte* passwd, int passLen,
(void)heap; (void)heap;
if (output == NULL || passLen < 0 || saltLen < 0 || kLen < 0 || if (output == NULL || passLen < 0 || saltLen < 0 || kLen < 0) {
hashType < 0 || hashType > WC_HASH_TYPE_MAX) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
if (iterations <= 0) if (iterations <= 0)
iterations = 1; iterations = 1;
hashT = (enum wc_HashType)hashType; hashT = wc_HashTypeConvert(hashType);
ret = wc_HashGetDigestSize(hashT); ret = wc_HashGetDigestSize(hashT);
if (ret < 0) if (ret < 0)
return ret; return ret;

24
wolfcrypt/test/test.c
View File

@@ -13147,15 +13147,23 @@ int pbkdf1_test(void)
int pwdbased_test(void) int pwdbased_test(void)
{ {
int ret = 0; int ret = 0;
#ifndef NO_SHA
ret += pbkdf1_test();
#endif
ret += pbkdf2_test();
ret += pkcs12_test();
#ifdef HAVE_SCRYPT
ret += scrypt_test();
#endif
#ifndef NO_SHA
ret = pbkdf1_test();
if (ret != 0)
return ret;
#endif
ret = pbkdf2_test();
if (ret != 0)
return ret;
ret = pkcs12_test();
if (ret != 0)
return ret;
#ifdef HAVE_SCRYPT
ret = scrypt_test();
if (ret != 0)
return ret;
#endif
return ret; return ret;
} }

9
wolfssl/internal.h
View File

@@ -1153,15 +1153,6 @@ enum Misc {
SESSION_FLUSH_COUNT = 256, /* Flush session cache unless user turns off */ SESSION_FLUSH_COUNT = 256, /* Flush session cache unless user turns off */
#ifdef HAVE_FIPS #ifdef HAVE_FIPS
/* these moved into wolfCrypt, but kept here for backwards compatibility with FIPS */
DES_KEY_SIZE = 8, /* des */
DES3_KEY_SIZE = 24, /* 3 des ede */
DES_IV_SIZE = DES_BLOCK_SIZE,
AES_256_KEY_SIZE = 32, /* for 256 bit */
AES_192_KEY_SIZE = 24, /* for 192 bit */
AES_IV_SIZE = 16, /* always block size */
AES_128_KEY_SIZE = 16, /* for 128 bit */
MAX_SYM_KEY_SIZE = AES_256_KEY_SIZE, MAX_SYM_KEY_SIZE = AES_256_KEY_SIZE,
#else #else
MAX_SYM_KEY_SIZE = WC_MAX_SYM_KEY_SIZE, MAX_SYM_KEY_SIZE = WC_MAX_SYM_KEY_SIZE,

15
wolfssl/wolfcrypt/aes.h
View File

@@ -62,6 +62,16 @@
extern "C" { extern "C" {
#endif #endif
/* these are required for FIPS and non-FIPS */
enum {
AES_128_KEY_SIZE = 16, /* for 128 bit */
AES_192_KEY_SIZE = 24, /* for 192 bit */
AES_256_KEY_SIZE = 32, /* for 256 bit */
AES_IV_SIZE = 16, /* always block size */
};
#ifndef HAVE_FIPS /* to avoid redefinition of structures */ #ifndef HAVE_FIPS /* to avoid redefinition of structures */
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
@@ -74,13 +84,8 @@ enum {
AES_DECRYPTION = 1, AES_DECRYPTION = 1,
AES_BLOCK_SIZE = 16, AES_BLOCK_SIZE = 16,
AES_IV_SIZE = AES_BLOCK_SIZE,
KEYWRAP_BLOCK_SIZE = 8, KEYWRAP_BLOCK_SIZE = 8,
AES_128_KEY_SIZE = 16, /* for 128 bit */
AES_192_KEY_SIZE = 24, /* for 192 bit */
AES_256_KEY_SIZE = 32, /* for 256 bit */
}; };

50
wolfssl/wolfcrypt/asn.h
View File

@@ -129,18 +129,6 @@ enum DN_Tags {
#define WOLFSSL_ORGUNIT_NAME "/OU=" #define WOLFSSL_ORGUNIT_NAME "/OU="
#define WOLFSSL_DOMAIN_COMPONENT "/DC=" #define WOLFSSL_DOMAIN_COMPONENT "/DC="
enum PBES {
PBE_MD5_DES = 0,
PBE_SHA1_RC4_128 = 1,
PBE_SHA1_DES = 2,
PBE_SHA1_DES3 = 3,
PBE_AES256_CBC = 4,
PBE_SHA1_RC4_128_SUM = 657,
PBE_SHA1_DES3_SUM = 659,
PBES2 = 13 /* algo ID */
};
enum ECC_TYPES { enum ECC_TYPES {
ECC_PREFIX_0 = 160, ECC_PREFIX_0 = 160,
ECC_PREFIX_1 = 161 ECC_PREFIX_1 = 161
@@ -150,12 +138,6 @@ enum Misc_ASN {
ASN_NAME_MAX = 256, ASN_NAME_MAX = 256,
MAX_SALT_SIZE = 64, /* MAX PKCS Salt length */ MAX_SALT_SIZE = 64, /* MAX PKCS Salt length */
MAX_IV_SIZE = 64, /* MAX PKCS Iv length */ MAX_IV_SIZE = 64, /* MAX PKCS Iv length */
MAX_KEY_SIZE = 64, /* MAX PKCS Key length */
PKCS5 = 5, /* PKCS oid tag */
PKCS5v2 = 6, /* PKCS #5 v2.0 */
PKCS8v0 = 0, /* default PKCS#8 version */
PKCS12v1 = 12, /* PKCS #12 */
MAX_UNICODE_SZ = 256,
ASN_BOOL_SIZE = 2, /* including type */ ASN_BOOL_SIZE = 2, /* including type */
ASN_ECC_HEADER_SZ = 2, /* String type + 1 byte len */ ASN_ECC_HEADER_SZ = 2, /* String type + 1 byte len */
ASN_ECC_CONTEXT_SZ = 2, /* Content specific type + 1 byte len */ ASN_ECC_CONTEXT_SZ = 2, /* Content specific type + 1 byte len */
@@ -1071,4 +1053,36 @@ WOLFSSL_LOCAL void FreeDecodedCRL(DecodedCRL*);
#endif #endif
#endif /* !NO_ASN */ #endif /* !NO_ASN */
#if !defined(NO_ASN) || !defined(NO_PWDBASED)
#ifndef MAX_KEY_SIZE
#define MAX_KEY_SIZE 64 /* MAX PKCS Key length */
#endif
#ifndef MAX_UNICODE_SZ
#define MAX_UNICODE_SZ 256
#endif
enum PBESTypes {
PBE_MD5_DES = 0,
PBE_SHA1_RC4_128 = 1,
PBE_SHA1_DES = 2,
PBE_SHA1_DES3 = 3,
PBE_AES256_CBC = 4,
PBE_SHA1_RC4_128_SUM = 657,
PBE_SHA1_DES3_SUM = 659,
PBES2 = 13 /* algo ID */
};
enum PKCSTypes {
PKCS5v2 = 6, /* PKCS #5 v2.0 */
PKCS12v1 = 12, /* PKCS #12 */
PKCS5 = 5, /* PKCS oid tag */
PKCS8v0 = 0, /* default PKCS#8 version */
};
#endif /* !NO_ASN || !NO_PWDBASED */
#endif /* WOLF_CRYPT_ASN_H */ #endif /* WOLF_CRYPT_ASN_H */

12
wolfssl/wolfcrypt/des3.h
View File

@@ -39,6 +39,14 @@
extern "C" { extern "C" {
#endif #endif
/* these are required for FIPS and non-FIPS */
enum {
DES_KEY_SIZE = 8, /* des */
DES3_KEY_SIZE = 24, /* 3 des ede */
DES_IV_SIZE = 16,
};
#ifndef HAVE_FIPS /* to avoid redefinition of macros */ #ifndef HAVE_FIPS /* to avoid redefinition of macros */
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
@@ -52,10 +60,6 @@ enum {
DES_BLOCK_SIZE = 8, DES_BLOCK_SIZE = 8,
DES_KS_SIZE = 32, /* internal DES key buffer size */ DES_KS_SIZE = 32, /* internal DES key buffer size */
DES_KEY_SIZE = 8, /* des */
DES3_KEY_SIZE = 24, /* 3 des ede */
DES_IV_SIZE = DES_BLOCK_SIZE,
DES_ENCRYPTION = 0, DES_ENCRYPTION = 0,
DES_DECRYPTION = 1 DES_DECRYPTION = 1
}; };

2
wolfssl/wolfcrypt/hash.h
View File

@@ -119,6 +119,8 @@ typedef union {
WOLFSSL_API int wc_HashGetOID(enum wc_HashType hash_type); WOLFSSL_API int wc_HashGetOID(enum wc_HashType hash_type);
#endif #endif
WOLFSSL_API enum wc_HashType wc_HashTypeConvert(int hashType);
WOLFSSL_API int wc_HashGetDigestSize(enum wc_HashType hash_type); WOLFSSL_API int wc_HashGetDigestSize(enum wc_HashType hash_type);
WOLFSSL_API int wc_HashGetBlockSize(enum wc_HashType hash_type); WOLFSSL_API int wc_HashGetBlockSize(enum wc_HashType hash_type);
WOLFSSL_API int wc_Hash(enum wc_HashType hash_type, WOLFSSL_API int wc_Hash(enum wc_HashType hash_type,