From 60b329f7e5c9ec1e999418ebbc5bb6894d2f262e Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Tue, 16 Jan 2018 15:39:58 -0700 Subject: [PATCH] fix example client error print out and ASN1_TIME_print after rebase --- examples/client/client.c | 4 ++-- wolfssl/ssl.h | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/examples/client/client.c b/examples/client/client.c index 1212e5e0b..54ab12937 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -2005,8 +2005,8 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) ret = NonBlockingSSL_Connect(ssl); /* will keep retrying on timeout */ #endif if (ret != WOLFSSL_SUCCESS) { - printf("wolfSSL_connect error %d, %s\n", ret, - wolfSSL_ERR_error_string(ret, buffer)); + printf("wolfSSL_connect error %d, %s\n", err, + wolfSSL_ERR_error_string(err, buffer)); wolfSSL_free(ssl); wolfSSL_CTX_free(ctx); err_sys("wolfSSL_connect failed"); diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index f4449e50a..9b983d779 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -924,6 +924,8 @@ WOLFSSL_API WOLFSSL_ASN1_INTEGER* wolfSSL_X509_get_serialNumber(WOLFSSL_X509*); WOLFSSL_API int wolfSSL_ASN1_TIME_print(WOLFSSL_BIO*, const WOLFSSL_ASN1_TIME*); +WOLFSSL_API char* wolfSSL_ASN1_TIME_to_string(WOLFSSL_ASN1_TIME* time, + char* buf, int len); WOLFSSL_API int wolfSSL_ASN1_INTEGER_cmp(const WOLFSSL_ASN1_INTEGER*, const WOLFSSL_ASN1_INTEGER*); WOLFSSL_API long wolfSSL_ASN1_INTEGER_get(const WOLFSSL_ASN1_INTEGER*); @@ -2412,11 +2414,6 @@ WOLFSSL_API int wolfSSL_accept_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack, WOLFSSL_API void wolfSSL_cert_service(void); #endif -#if defined(WOLFSSL_MYSQL_COMPATIBLE) || defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY) -WOLFSSL_API char* wolfSSL_ASN1_TIME_to_string(WOLFSSL_ASN1_TIME* time, - char* buf, int len); -#endif /* WOLFSSL_MYSQL_COMPATIBLE */ - #ifdef OPENSSL_EXTRA enum {