wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 11:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

warnings for builds of haproxy, nginx, and leanpsk

Browse Source
This commit is contained in:
Jacob Barthelmeh
2017-05-02 14:29:53 -06:00
parent 0532adf653
commit dbb67d8582
4 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ssl.c
View File

@@ -23146,18 +23146,6 @@ int wolfSSL_X509_NAME_get_sz(WOLFSSL_X509_NAME* name)
} }
const byte* wolfSSL_SESSION_get_id(WOLFSSL_SESSION* sess, unsigned int* idLen)
{
WOLFSSL_ENTER("wolfSSL_SESSION_get_id");
WOLFSSL_STUB("wolfSSL_SESSION_get_id");
if(!sess || !idLen) {
WOLFSSL_MSG("Bad func args. Please provide idLen");
return NULL;
}
*idLen = sess->sessionIDSz;
return sess->sessionID;
}
#ifdef HAVE_SNI #ifdef HAVE_SNI
int wolfSSL_set_tlsext_host_name(WOLFSSL* ssl, const char* host_name) int wolfSSL_set_tlsext_host_name(WOLFSSL* ssl, const char* host_name)
{ {
@@ -23270,8 +23258,22 @@ void wolfSSL_sk_X509_pop_free(STACK_OF(WOLFSSL_X509)* sk, void f (WOLFSSL_X509*)
} }
#endif /* OPENSSL_EXTRA and HAVE_STUNNEL */ #endif /* OPENSSL_EXTRA and HAVE_STUNNEL */
#if defined(OPENSSL_EXTRA) && (defined(HAVE_STUNNEL) || defined(WOLFSSL_NGINX))\
|| defined(WOLFSSL_HAPROXY)
const byte* wolfSSL_SESSION_get_id(WOLFSSL_SESSION* sess, unsigned int* idLen)
{
WOLFSSL_ENTER("wolfSSL_SESSION_get_id");
if(!sess || !idLen) {
WOLFSSL_MSG("Bad func args. Please provide idLen");
return NULL;
}
*idLen = sess->sessionIDSz;
return sess->sessionID;
}
#endif
#if (defined(OPENSSL_EXTRA) && defined(HAVE_STUNNEL)) \ #if (defined(OPENSSL_EXTRA) && defined(HAVE_STUNNEL)) \
|| defined(WOLFSSL_MYSQL_COMPATIBLE) || defined(WOLFSSL_NGINX) || defined(WOLFSSL_MYSQL_COMPATIBLE) || defined(WOLFSSL_NGINX)
int wolfSSL_CTX_get_verify_mode(WOLFSSL_CTX* ctx) int wolfSSL_CTX_get_verify_mode(WOLFSSL_CTX* ctx)

7
wolfcrypt/benchmark/benchmark.c
View File

@@ -621,7 +621,12 @@ static void bench_stats_sym_finish(const char* desc, int doAsync, int count, dou
#endif #endif
} }
static void bench_stats_asym_finish(const char* algo, int strength, /* declare here rather than creating a static function to avoid warning of not
* used in the case of something like a leanpsk only build */
void bench_stats_asym_finish(const char* algo, int strength,
const char* desc, int doAsync, int count, double start);
void bench_stats_asym_finish(const char* algo, int strength,
const char* desc, int doAsync, int count, double start) const char* desc, int doAsync, int count, double start)
{ {
double total, each = 0, opsSec, milliEach; double total, each = 0, opsSec, milliEach;

4
wolfcrypt/test/test.c
View File

@@ -1860,14 +1860,17 @@ int hash_test(void)
ret = wc_HashFinal(&hash, typesGood[i], out); ret = wc_HashFinal(&hash, typesGood[i], out);
if (ret != exp_ret) if (ret != exp_ret)
return -4160 - i; return -4160 - i;
#if !defined(NO_ASN) || !defined(NO_DH) || defined(HAVE_ECC)
ret = wc_HashGetOID(typesGood[i]); ret = wc_HashGetOID(typesGood[i]);
if (ret == BAD_FUNC_ARG || if (ret == BAD_FUNC_ARG ||
(exp_ret == 0 && ret == HASH_TYPE_E) || (exp_ret == 0 && ret == HASH_TYPE_E) ||
(exp_ret != 0 && ret != HASH_TYPE_E)) { (exp_ret != 0 && ret != HASH_TYPE_E)) {
return -4170 - i; return -4170 - i;
} }
#endif /* !defined(NO_ASN) || !defined(NO_DH) || defined(HAVE_ECC) */
} }
#if !defined(NO_ASN) || !defined(NO_DH) || defined(HAVE_ECC)
ret = wc_HashGetOID(WC_HASH_TYPE_MD2); ret = wc_HashGetOID(WC_HASH_TYPE_MD2);
#ifdef WOLFSSL_MD2 #ifdef WOLFSSL_MD2
if (ret == HASH_TYPE_E || ret == BAD_FUNC_ARG) if (ret == HASH_TYPE_E || ret == BAD_FUNC_ARG)
@@ -1890,6 +1893,7 @@ int hash_test(void)
ret = wc_HashGetOID(WC_HASH_TYPE_NONE); ret = wc_HashGetOID(WC_HASH_TYPE_NONE);
if (ret != BAD_FUNC_ARG) if (ret != BAD_FUNC_ARG)
return -4183; return -4183;
#endif /* !defined(NO_ASN) || !defined(NO_DH) || defined(HAVE_ECC) */
#ifndef NO_ASN #ifndef NO_ASN
#ifdef WOLFSSL_MD2 #ifdef WOLFSSL_MD2

2
wolfssl/ssl.h
View File

@@ -2222,6 +2222,7 @@ WOLFSSL_LOCAL char* wolfSSL_get_ocsp_url(WOLFSSL* ssl);
/* Not an OpenSSL API. */ /* Not an OpenSSL API. */
WOLFSSL_API int wolfSSL_set_ocsp_url(WOLFSSL* ssl, char* url); WOLFSSL_API int wolfSSL_set_ocsp_url(WOLFSSL* ssl, char* url);
WOLFSSL_API STACK_OF(WOLFSSL_CIPHER) *wolfSSL_get_ciphers_compat(const WOLFSSL *ssl);
WOLFSSL_API void wolfSSL_OPENSSL_config(char *config_name); WOLFSSL_API void wolfSSL_OPENSSL_config(char *config_name);
WOLFSSL_API int wolfSSL_X509_get_ex_new_index(int idx, void *arg, void *a, WOLFSSL_API int wolfSSL_X509_get_ex_new_index(int idx, void *arg, void *a,
void *b, void *c); void *b, void *c);
@@ -2313,7 +2314,6 @@ WOLFSSL_API void wolfSSL_get0_next_proto_negotiated(const WOLFSSL *s, const unsi
#ifdef WOLFSSL_HAPROXY #ifdef WOLFSSL_HAPROXY
WOLFSSL_API const unsigned char *SSL_SESSION_get0_id_context( WOLFSSL_API const unsigned char *SSL_SESSION_get0_id_context(
const WOLFSSL_SESSION *sess, unsigned int *sid_ctx_length); const WOLFSSL_SESSION *sess, unsigned int *sid_ctx_length);
WOLFSSL_API STACK_OF(WOLFSSL_CIPHER) *wolfSSL_get_ciphers_compat(const WOLFSSL *ssl);
#endif #endif
WOLFSSL_API int SSL_SESSION_set1_id(WOLFSSL_SESSION *s, const unsigned char *sid, unsigned int sid_len); WOLFSSL_API int SSL_SESSION_set1_id(WOLFSSL_SESSION *s, const unsigned char *sid, unsigned int sid_len);