mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more macro guards for asn

Browse Source
This commit is contained in:
Jacob Barthelmeh 2018-02-08 16:05:42 -07:00
parent 16a4aef18e
commit e187ce42da
1 changed files with 67 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
wolfcrypt/src/asn.c
View File

@ -395,24 +395,48 @@ static int GetInteger7Bit(const byte* input, word32* inOutIdx, word32 maxIdx)
} }
#ifndef NO_DSA #if !defined(NO_DSA) && !defined(NO_SHA)
static char sigSha1wDsaName[] = "SHAwDSA"; static char sigSha1wDsaName[] = "SHAwDSA";
#endif /* NO_DSA */ #endif /* NO_DSA */
#ifndef NO_RSA #ifndef NO_RSA
static char sigMd2wRsaName[] = "MD2wRSA"; #ifdef WOLFSSL_MD2
static char sigMd5wRsaName[] = "MD5wRSA"; static char sigMd2wRsaName[] = "MD2wRSA";
static char sigSha1wRsaName[] = "SHAwRSA"; #endif
static char sigSha224wRsaName[] = "SHA224wRSA"; #ifndef NO_MD5
static char sigSha256wRsaName[] = "SHA256wRSA"; static char sigMd5wRsaName[] = "MD5wRSA";
static char sigSha384wRsaName[] = "SHA384wRSA"; #endif
static char sigSha512wRsaName[] = "SHA512wRSA"; #ifndef NO_SHA
static char sigSha1wRsaName[] = "SHAwRSA";
#endif
#ifdef WOLFSSL_SHA224
static char sigSha224wRsaName[] = "SHA224wRSA";
#endif
#ifndef NO_SHA256
static char sigSha256wRsaName[] = "SHA256wRSA";
#endif
#ifdef WOLFSSL_SHA384
static char sigSha384wRsaName[] = "SHA384wRSA";
#endif
#ifdef WOLFSSL_SHA512
static char sigSha512wRsaName[] = "SHA512wRSA";
#endif
#endif /* NO_RSA */ #endif /* NO_RSA */
#ifdef HAVE_ECC #ifdef HAVE_ECC
static char sigSha1wEcdsaName[] = "SHAwECDSA"; #ifndef NO_SHA
static char sigSha224wEcdsaName[] = "SHA224wECDSA"; static char sigSha1wEcdsaName[] = "SHAwECDSA";
static char sigSha256wEcdsaName[] = "SHA256wECDSA"; #endif
static char sigSha384wEcdsaName[] = "SHA384wECDSA"; #ifdef WOLFSSL_SHA224
static char sigSha512wEcdsaName[] = "SHA512wECDSA"; static char sigSha224wEcdsaName[] = "SHA224wECDSA";
#endif
#ifndef NO_SHA256
static char sigSha256wEcdsaName[] = "SHA256wECDSA";
#endif
#ifdef WOLFSSL_SHA384
static char sigSha384wEcdsaName[] = "SHA384wECDSA";
#endif
#ifdef WOLFSSL_SHA512
static char sigSha512wEcdsaName[] = "SHA512wECDSA";
#endif
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
static char sigUnknownName[] = "Unknown"; static char sigUnknownName[] = "Unknown";
@ -423,38 +447,62 @@ static char sigUnknownName[] = "Unknown";
*/ */
char* GetSigName(int oid) { char* GetSigName(int oid) {
switch (oid) { switch (oid) {
#ifndef NO_DSA #if !defined(NO_DSA) && !defined(NO_SHA)
case CTC_SHAwDSA: case CTC_SHAwDSA:
return sigSha1wDsaName; return sigSha1wDsaName;
#endif /* NO_DSA */ #endif /* NO_DSA && NO_SHA */
#ifndef NO_RSA #ifndef NO_RSA
#ifdef WOLFSSL_MD2
case CTC_MD2wRSA: case CTC_MD2wRSA:
return sigMd2wRsaName; return sigMd2wRsaName;
#endif
#ifndef NO_MD5
case CTC_MD5wRSA: case CTC_MD5wRSA:
return sigMd5wRsaName; return sigMd5wRsaName;
#endif
#ifndef NO_SHA
case CTC_SHAwRSA: case CTC_SHAwRSA:
return sigSha1wRsaName; return sigSha1wRsaName;
#endif
#ifdef WOLFSSL_SHA224
case CTC_SHA224wRSA: case CTC_SHA224wRSA:
return sigSha224wRsaName; return sigSha224wRsaName;
#endif
#ifndef NO_SHA256
case CTC_SHA256wRSA: case CTC_SHA256wRSA:
return sigSha256wRsaName; return sigSha256wRsaName;
#endif
#ifdef WOLFSSL_SHA384
case CTC_SHA384wRSA: case CTC_SHA384wRSA:
return sigSha384wRsaName; return sigSha384wRsaName;
#endif
#ifdef WOLFSSL_SHA512
case CTC_SHA512wRSA: case CTC_SHA512wRSA:
return sigSha512wRsaName; return sigSha512wRsaName;
#endif /* NO_RSA */ #endif
#ifdef HAVE_ECC #endif /* NO_RSA */
#ifdef HAVE_ECC
#ifndef NO_SHA
case CTC_SHAwECDSA: case CTC_SHAwECDSA:
return sigSha1wEcdsaName; return sigSha1wEcdsaName;
#endif
#ifdef WOLFSSL_SHA224
case CTC_SHA224wECDSA: case CTC_SHA224wECDSA:
return sigSha224wEcdsaName; return sigSha224wEcdsaName;
#endif
#ifndef NO_SHA256
case CTC_SHA256wECDSA: case CTC_SHA256wECDSA:
return sigSha256wEcdsaName; return sigSha256wEcdsaName;
#endif
#ifdef WOLFSSL_SHA384
case CTC_SHA384wECDSA: case CTC_SHA384wECDSA:
return sigSha384wEcdsaName; return sigSha384wEcdsaName;
#endif
#ifdef WOLFSSL_SHA512
case CTC_SHA512wECDSA: case CTC_SHA512wECDSA:
return sigSha512wEcdsaName; return sigSha512wEcdsaName;
#endif /* HAVE_ECC */ #endif
#endif /* HAVE_ECC */
default: default:
return sigUnknownName; return sigUnknownName;
} }