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

Merge pull request #1274 from dgarske/fix_jenkins

Browse Source 
Fixes to address Jenkins issues
This commit is contained in:
toddouska
2017-12-18 16:31:02 -08:00
committed by GitHub
parent bacbc06856 57c0b5d4ac
commit 680f78f2ae
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/internal.c
View File

@@ -2699,7 +2699,8 @@ static INLINE void DecodeSigAlg(const byte* input, byte* hashAlgo, byte* hsType)
} }
#endif /* !NO_WOLFSSL_SERVER || !NO_CERTS */ #endif /* !NO_WOLFSSL_SERVER || !NO_CERTS */
#if !defined(NO_DH) || defined(HAVE_ECC) #if !defined(NO_DH) || defined(HAVE_ECC) || \
(!defined(NO_RSA) && defined(WC_RSA_PSS))
static enum wc_HashType HashAlgoToType(int hashAlgo) static enum wc_HashType HashAlgoToType(int hashAlgo)
{ {
@@ -2729,9 +2730,11 @@ static enum wc_HashType HashAlgoToType(int hashAlgo)
return WC_HASH_TYPE_NONE; return WC_HASH_TYPE_NONE;
} }
#ifndef NO_CERTS #endif /* !NO_DH || HAVE_ECC || (!NO_RSA && WC_RSA_PSS) */
#ifndef NO_CERTS
void InitX509Name(WOLFSSL_X509_NAME* name, int dynamicFlag) void InitX509Name(WOLFSSL_X509_NAME* name, int dynamicFlag)
{ {
(void)dynamicFlag; (void)dynamicFlag;
@@ -2840,10 +2843,8 @@ void FreeX509(WOLFSSL_X509* x509)
if (x509->altNames) if (x509->altNames)
FreeAltNames(x509->altNames, x509->heap); FreeAltNames(x509->altNames, x509->heap);
} }
#endif /* !NO_CERTS */
#endif /* !NO_DH || HAVE_ECC */
#ifndef NO_CERTS
/* Encode the signature algorithm into buffer. /* Encode the signature algorithm into buffer.
* *
* hashalgo The hash algorithm. * hashalgo The hash algorithm.

6
tests/api.c
View File

@@ -10636,7 +10636,7 @@ static void test_wolfSSL_ASN1_TIME_adj(void)
const int hour = 60*60; const int hour = 60*60;
const int min = 60; const int min = 60;
const byte asn_utc_time = ASN_UTC_TIME; const byte asn_utc_time = ASN_UTC_TIME;
#ifndef TIME_T_NOT_LONG #if !defined(TIME_T_NOT_LONG) && !defined(NO_64BIT)
const byte asn_gen_time = ASN_GENERALIZED_TIME; const byte asn_gen_time = ASN_GENERALIZED_TIME;
#endif #endif
WOLFSSL_ASN1_TIME *asn_time, *s; WOLFSSL_ASN1_TIME *asn_time, *s;
@@ -10671,7 +10671,7 @@ static void test_wolfSSL_ASN1_TIME_adj(void)
XMEMSET(date_str, 0, sizeof(date_str)); XMEMSET(date_str, 0, sizeof(date_str));
/* Generalized time will overflow time_t if not long */ /* Generalized time will overflow time_t if not long */
#ifndef TIME_T_NOT_LONG #if !defined(TIME_T_NOT_LONG) && !defined(NO_64BIT)
s = (WOLFSSL_ASN1_TIME*)XMALLOC(sizeof(WOLFSSL_ASN1_TIME), NULL, s = (WOLFSSL_ASN1_TIME*)XMALLOC(sizeof(WOLFSSL_ASN1_TIME), NULL,
DYNAMIC_TYPE_OPENSSL); DYNAMIC_TYPE_OPENSSL);
/* GeneralizedTime notation test */ /* GeneralizedTime notation test */
@@ -10686,7 +10686,7 @@ static void test_wolfSSL_ASN1_TIME_adj(void)
XFREE(s,NULL,DYNAMIC_TYPE_OPENSSL); XFREE(s,NULL,DYNAMIC_TYPE_OPENSSL);
XMEMSET(date_str, 0, sizeof(date_str)); XMEMSET(date_str, 0, sizeof(date_str));
#endif #endif /* !TIME_T_NOT_LONG && !NO_64BIT */
/* if WOLFSSL_ASN1_TIME struct is not allocated */ /* if WOLFSSL_ASN1_TIME struct is not allocated */
s = NULL; s = NULL;