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

windows build fixes

Browse Source
This commit is contained in:
toddouska 2012-05-18 11:48:38 -07:00
parent 2806c995a8
commit 7e322558ef
4 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ctaocrypt/test/test.c
View File

@ -1685,6 +1685,9 @@ int openssl_test()
testVector a, b, c, d, e, f;
byte hash[SHA_DIGEST_SIZE*4]; /* max size */
(void)e;
(void)f;
a.input = "1234567890123456789012345678901234567890123456789012345678"
"9012345678901234567890";
a.output = "\x57\xed\xf4\xa2\x2b\xe3\xc9\x55\xac\x49\xda\x2e\x21\x07\xb6"
@ -1758,7 +1761,7 @@ int openssl_test()
#endif /* CYASSL_SHA384 */
#ifdef CYASSL_SHA384
#ifdef CYASSL_SHA512
f.input = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhi"
"jklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu";
@ -1779,7 +1782,7 @@ int openssl_test()
if (memcmp(hash, f.output, SHA512_DIGEST_SIZE) != 0)
return -80;
#endif /* CYASSL_SHA384 */
#endif /* CYASSL_SHA512 */
if (RAND_bytes(hash, sizeof(hash)) != 1)

7
cyassl/openssl/ssl.h
View File

@ -34,6 +34,13 @@
extern "C" {
#endif
#ifdef _WIN32
/* wincrypt.h clashes */
#undef X509_NAME
#undef OCSP_REQUEST
#undef OCSP_RESPONSE
#endif
typedef CYASSL SSL;
typedef CYASSL_SESSION SSL_SESSION;

6
cyassl/ssl.h
View File

@ -43,12 +43,6 @@
#define CYASSL_VERSION LIBCYASSL_VERSION_STRING
#endif
#ifdef _WIN32
/* wincrypt.h clashes */
#undef X509_NAME
#undef OCSP_REQUEST
#undef OCSP_RESPONSE
#endif
#ifdef __cplusplus

24
src/ssl.c
View File

@ -1387,15 +1387,15 @@ int CyaSSL_CertManagerLoadCA(CYASSL_CERT_MANAGER* cm, const char* file,
/* turn on CRL if off and compiled in, set options */
int CyaSSL_CertManagerEnableCRL(CYASSL_CERT_MANAGER* cm, int options)
{
int ret = SSL_SUCCESS;
(void)options;
CYASSL_ENTER("CyaSSL_CertManagerEnableCRL");
if (cm == NULL)
return BAD_FUNC_ARG;
#ifndef HAVE_CRL
return NOT_COMPILED_IN;
#else
#ifdef HAVE_CRL
if (cm->crl == NULL) {
cm->crl = (CYASSL_CRL*)XMALLOC(sizeof(CYASSL_CRL), cm->heap,
DYNAMIC_TYPE_CRL);
@ -1412,9 +1412,11 @@ int CyaSSL_CertManagerEnableCRL(CYASSL_CERT_MANAGER* cm, int options)
cm->crlEnabled = 1;
if (options & CYASSL_CRL_CHECKALL)
cm->crlCheckAll = 1;
#else
ret = NOT_COMPILED_IN;
#endif
return SSL_SUCCESS;
return ret;
}
@ -5989,7 +5991,7 @@ static int initGlobalRNG = 0;
{
CYASSL_MSG("CyaSSL_BN_clear_free");
return CyaSSL_BN_free(bn);
CyaSSL_BN_free(bn);
}
@ -6866,6 +6868,7 @@ static int initGlobalRNG = 0;
(void)cb;
(void)bn;
(void)bits;
if (InitRng(&rng) < 0) {
CYASSL_MSG("RNG init failed");
@ -6877,10 +6880,6 @@ static int initGlobalRNG = 0;
CYASSL_MSG("MakeRsaKey failed");
return -1;
}
#else
CYASSL_MSG("No Key Gen built in");
return -1;
#endif
if (SetRsaExternal(rsa) < 0) {
CYASSL_MSG("SetRsaExternal failed");
@ -6890,6 +6889,11 @@ static int initGlobalRNG = 0;
rsa->inSet = 1;
return 1; /* success */
#else
CYASSL_MSG("No Key Gen built in");
return -1;
#endif
}
@ -7218,7 +7222,6 @@ static int initGlobalRNG = 0;
default:
CYASSL_MSG("Bad digest id value");
return NULL;
}
return NULL;
@ -7409,7 +7412,6 @@ static int initGlobalRNG = 0;
default: {
CYASSL_MSG("bad type");
return 0;
}
}
return 0;