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

fix pkCurveOID c files, doesn't require openssl extra

Browse Source
This commit is contained in:
toddouska
2014-02-01 12:14:41 -08:00
parent c14bc1a45c
commit 51b3b1cb6c
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ctaocrypt/src/asn.c
View File

@@ -1323,10 +1323,10 @@ void InitDecodedCert(DecodedCert* cert, byte* source, word32 inSz, void* heap)
cert->extAuthKeyIdSz = 0; cert->extAuthKeyIdSz = 0;
cert->extSubjKeyIdSrc = NULL; cert->extSubjKeyIdSrc = NULL;
cert->extSubjKeyIdSz = 0; cert->extSubjKeyIdSz = 0;
#endif /* OPENSSL_EXTRA */
#ifdef HAVE_ECC #ifdef HAVE_ECC
cert->pkCurveOID = 0; cert->pkCurveOID = 0;
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
#endif /* OPENSSL_EXTRA */
#ifdef CYASSL_SEP #ifdef CYASSL_SEP
cert->deviceTypeSz = 0; cert->deviceTypeSz = 0;
cert->deviceType = NULL; cert->deviceType = NULL;

12
src/internal.c
View File

@@ -1282,6 +1282,9 @@ void InitX509(CYASSL_X509* x509, int dynamicFlag)
x509->altNamesNext = NULL; x509->altNamesNext = NULL;
x509->dynamicMemory = (byte)dynamicFlag; x509->dynamicMemory = (byte)dynamicFlag;
x509->isCa = 0; x509->isCa = 0;
#ifdef HAVE_ECC
x509->pkCurveOID = 0;
#endif /* HAVE_ECC */
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
x509->pathLength = 0; x509->pathLength = 0;
x509->basicConstSet = 0; x509->basicConstSet = 0;
@@ -1300,9 +1303,6 @@ void InitX509(CYASSL_X509* x509, int dynamicFlag)
x509->keyUsageSet = 0; x509->keyUsageSet = 0;
x509->keyUsageCrit = 0; x509->keyUsageCrit = 0;
x509->keyUsage = 0; x509->keyUsage = 0;
#ifdef HAVE_ECC
x509->pkCurveOID = 0;
#endif /* HAVE_ECC */
#ifdef CYASSL_SEP #ifdef CYASSL_SEP
x509->certPolicySet = 0; x509->certPolicySet = 0;
x509->certPolicyCrit = 0; x509->certPolicyCrit = 0;
@@ -3225,14 +3225,14 @@ int CopyDecodedToX509(CYASSL_X509* x509, DecodedCert* dCert)
} }
x509->keyUsageSet = dCert->extKeyUsageSet; x509->keyUsageSet = dCert->extKeyUsageSet;
x509->keyUsageCrit = dCert->extKeyUsageCrit; x509->keyUsageCrit = dCert->extKeyUsageCrit;
#ifdef HAVE_ECC
x509->pkCurveOID = dCert->pkCurveOID;
#endif /* HAVE_ECC */
#ifdef CYASSL_SEP #ifdef CYASSL_SEP
x509->certPolicySet = dCert->extCertPolicySet; x509->certPolicySet = dCert->extCertPolicySet;
x509->certPolicyCrit = dCert->extCertPolicyCrit; x509->certPolicyCrit = dCert->extCertPolicyCrit;
#endif /* CYASSL_SEP */ #endif /* CYASSL_SEP */
#endif /* OPENSSL_EXTRA */ #endif /* OPENSSL_EXTRA */
#ifdef HAVE_ECC
x509->pkCurveOID = dCert->pkCurveOID;
#endif /* HAVE_ECC */
return ret; return ret;
} }