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

Merge pull request #3034 from kaleb-himes/FORUM_DSA_ISSUE

Browse Source 
Seperate QT and DSA dependencies
This commit is contained in:
David Garske
2020-06-11 15:40:12 -07:00
committed by GitHub
parent cc13c9f062 2fe08e1951
commit 255cc016b3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/src/asn.c
View File

@@ -882,7 +882,7 @@ int GetInt(mp_int* mpi, const byte* input, word32* inOutIdx, word32 maxIdx)
} }
#if (!defined(WOLFSSL_KEY_GEN) && !defined(OPENSSL_EXTRA) && defined(RSA_LOW_MEM)) \ #if (!defined(WOLFSSL_KEY_GEN) && !defined(OPENSSL_EXTRA) && defined(RSA_LOW_MEM)) \
|| defined(WOLFSSL_RSA_PUBLIC_ONLY) || (!defined(NO_DSA) && defined(WOLFSSL_QT)) || defined(WOLFSSL_RSA_PUBLIC_ONLY) || (!defined(NO_DSA))
#if !defined(NO_RSA) && !defined(HAVE_USER_RSA) #if !defined(NO_RSA) && !defined(HAVE_USER_RSA)
static int SkipInt(const byte* input, word32* inOutIdx, word32 maxIdx) static int SkipInt(const byte* input, word32* inOutIdx, word32 maxIdx)
{ {
@@ -5113,7 +5113,7 @@ static int StoreRsaKey(DecodedCert* cert, word32 bitStringEnd)
static int GetKey(DecodedCert* cert) static int GetKey(DecodedCert* cert)
{ {
int length; int length;
#if !defined(NO_DSA) && defined(WOLFSSL_QT) #ifndef NO_DSA
int tmpLen; int tmpLen;
#endif #endif
#if defined(HAVE_ECC) || defined(HAVE_NTRU) #if defined(HAVE_ECC) || defined(HAVE_NTRU)
@@ -5123,7 +5123,7 @@ static int GetKey(DecodedCert* cert)
if (GetSequence(cert->source, &cert->srcIdx, &length, cert->maxIdx) < 0) if (GetSequence(cert->source, &cert->srcIdx, &length, cert->maxIdx) < 0)
return ASN_PARSE_E; return ASN_PARSE_E;
#if !defined(NO_DSA) && defined(WOLFSSL_QT) #ifndef NO_DSA
tmpLen = length + 4; tmpLen = length + 4;
#endif #endif
@@ -5336,7 +5336,7 @@ static int GetKey(DecodedCert* cert)
return 0; return 0;
} }
#endif /* HAVE_ED448 */ #endif /* HAVE_ED448 */
#if !defined(NO_DSA) && defined(WOLFSSL_QT) #ifndef NO_DSA
case DSAk: case DSAk:
{ {
int ret; int ret;
@@ -5369,7 +5369,7 @@ static int GetKey(DecodedCert* cert)
cert->srcIdx += length; cert->srcIdx += length;
return 0; return 0;
} }
#endif /* NO_DSA && QT */ #endif /* NO_DSA */
default: default:
return ASN_UNKNOWN_OID_E; return ASN_UNKNOWN_OID_E;
} }