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

more macro guards

Browse Source
This commit is contained in:
Jacob Barthelmeh
2018-02-13 14:47:04 -07:00
parent c9525d9c1d
commit 8006b68cac
1 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
wolfcrypt/src/asn.c
View File

@@ -952,12 +952,22 @@ static const byte wrapAes192Oid[] = {96, 134, 72, 1, 101, 3, 4, 1, 25};
static const byte wrapAes256Oid[] = {96, 134, 72, 1, 101, 3, 4, 1, 45}; static const byte wrapAes256Oid[] = {96, 134, 72, 1, 101, 3, 4, 1, 45};
/* cmsKeyAgreeType */ /* cmsKeyAgreeType */
static const byte dhSinglePass_stdDH_sha1kdf_Oid[] = #ifndef NO_SHA
static const byte dhSinglePass_stdDH_sha1kdf_Oid[] =
{43, 129, 5, 16, 134, 72, 63, 0, 2}; {43, 129, 5, 16, 134, 72, 63, 0, 2};
static const byte dhSinglePass_stdDH_sha224kdf_Oid[] = {43, 129, 4, 1, 11, 0}; #endif
static const byte dhSinglePass_stdDH_sha256kdf_Oid[] = {43, 129, 4, 1, 11, 1}; #ifdef WOLFSSL_SHA224
static const byte dhSinglePass_stdDH_sha384kdf_Oid[] = {43, 129, 4, 1, 11, 2}; static const byte dhSinglePass_stdDH_sha224kdf_Oid[] = {43, 129, 4, 1, 11, 0};
static const byte dhSinglePass_stdDH_sha512kdf_Oid[] = {43, 129, 4, 1, 11, 3}; #endif
#ifndef NO_SHA256
static const byte dhSinglePass_stdDH_sha256kdf_Oid[] = {43, 129, 4, 1, 11, 1};
#endif
#ifdef WOLFSSL_SHA384
static const byte dhSinglePass_stdDH_sha384kdf_Oid[] = {43, 129, 4, 1, 11, 2};
#endif
#ifdef WOLFSSL_SHA512
static const byte dhSinglePass_stdDH_sha512kdf_Oid[] = {43, 129, 4, 1, 11, 3};
#endif
/* ocspType */ /* ocspType */
#ifdef HAVE_OCSP #ifdef HAVE_OCSP
@@ -1408,43 +1418,59 @@ const byte* OidFromId(word32 id, word32 type, word32* oidSz)
case oidKeyWrapType: case oidKeyWrapType:
switch (id) { switch (id) {
#ifdef WOLFSSL_AES_128
case AES128_WRAP: case AES128_WRAP:
oid = wrapAes128Oid; oid = wrapAes128Oid;
*oidSz = sizeof(wrapAes128Oid); *oidSz = sizeof(wrapAes128Oid);
break; break;
#endif
#ifdef WOLFSSL_AES_192
case AES192_WRAP: case AES192_WRAP:
oid = wrapAes192Oid; oid = wrapAes192Oid;
*oidSz = sizeof(wrapAes192Oid); *oidSz = sizeof(wrapAes192Oid);
break; break;
#endif
#ifdef WOLFSSL_AES_256
case AES256_WRAP: case AES256_WRAP:
oid = wrapAes256Oid; oid = wrapAes256Oid;
*oidSz = sizeof(wrapAes256Oid); *oidSz = sizeof(wrapAes256Oid);
break; break;
#endif
} }
break; break;
case oidCmsKeyAgreeType: case oidCmsKeyAgreeType:
switch (id) { switch (id) {
#ifndef NO_SHA
case dhSinglePass_stdDH_sha1kdf_scheme: case dhSinglePass_stdDH_sha1kdf_scheme:
oid = dhSinglePass_stdDH_sha1kdf_Oid; oid = dhSinglePass_stdDH_sha1kdf_Oid;
*oidSz = sizeof(dhSinglePass_stdDH_sha1kdf_Oid); *oidSz = sizeof(dhSinglePass_stdDH_sha1kdf_Oid);
break; break;
#endif
#ifdef WOLFSSL_SHA224
case dhSinglePass_stdDH_sha224kdf_scheme: case dhSinglePass_stdDH_sha224kdf_scheme:
oid = dhSinglePass_stdDH_sha224kdf_Oid; oid = dhSinglePass_stdDH_sha224kdf_Oid;
*oidSz = sizeof(dhSinglePass_stdDH_sha224kdf_Oid); *oidSz = sizeof(dhSinglePass_stdDH_sha224kdf_Oid);
break; break;
#endif
#ifndef NO_SHA256
case dhSinglePass_stdDH_sha256kdf_scheme: case dhSinglePass_stdDH_sha256kdf_scheme:
oid = dhSinglePass_stdDH_sha256kdf_Oid; oid = dhSinglePass_stdDH_sha256kdf_Oid;
*oidSz = sizeof(dhSinglePass_stdDH_sha256kdf_Oid); *oidSz = sizeof(dhSinglePass_stdDH_sha256kdf_Oid);
break; break;
#endif
#ifdef WOLFSSL_SHA384
case dhSinglePass_stdDH_sha384kdf_scheme: case dhSinglePass_stdDH_sha384kdf_scheme:
oid = dhSinglePass_stdDH_sha384kdf_Oid; oid = dhSinglePass_stdDH_sha384kdf_Oid;
*oidSz = sizeof(dhSinglePass_stdDH_sha384kdf_Oid); *oidSz = sizeof(dhSinglePass_stdDH_sha384kdf_Oid);
break; break;
#endif
#ifdef WOLFSSL_SHA512
case dhSinglePass_stdDH_sha512kdf_scheme: case dhSinglePass_stdDH_sha512kdf_scheme:
oid = dhSinglePass_stdDH_sha512kdf_Oid; oid = dhSinglePass_stdDH_sha512kdf_Oid;
*oidSz = sizeof(dhSinglePass_stdDH_sha512kdf_Oid); *oidSz = sizeof(dhSinglePass_stdDH_sha512kdf_Oid);
break; break;
#endif
} }
break; break;