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

fixes API names (marketing wise);

Browse Source
This commit is contained in:
Moisés Guimarães 2015-12-14 23:12:08 -03:00
parent a15c003211
commit 9688a0f0db
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/client/client.c
View File

@ -1008,7 +1008,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
if (statusRequest) { if (statusRequest) {
switch (statusRequest) { switch (statusRequest) {
case WOLFSSL_CSR_OCSP: case WOLFSSL_CSR_OCSP:
if (wolfSSL_UseCertificateStatusRequest(ssl, WOLFSSL_CSR_OCSP, if (wolfSSL_UseOCSPStapling(ssl, WOLFSSL_CSR_OCSP,
WOLFSSL_CSR_OCSP_USE_NONCE) != SSL_SUCCESS) WOLFSSL_CSR_OCSP_USE_NONCE) != SSL_SUCCESS)
err_sys("UseCertificateStatusRequest failed"); err_sys("UseCertificateStatusRequest failed");
@ -1022,13 +1022,13 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
if (statusRequest) { if (statusRequest) {
switch (statusRequest) { switch (statusRequest) {
case WOLFSSL_CSR2_OCSP: case WOLFSSL_CSR2_OCSP:
if (wolfSSL_UseCertificateStatusRequestV2(ssl, if (wolfSSL_UseOCSPStaplingV2(ssl,
WOLFSSL_CSR2_OCSP, WOLFSSL_CSR2_OCSP_USE_NONCE) WOLFSSL_CSR2_OCSP, WOLFSSL_CSR2_OCSP_USE_NONCE)
!= SSL_SUCCESS) != SSL_SUCCESS)
err_sys("UseCertificateStatusRequest failed"); err_sys("UseCertificateStatusRequest failed");
break; break;
case WOLFSSL_CSR2_OCSP_MULTI: case WOLFSSL_CSR2_OCSP_MULTI:
if (wolfSSL_UseCertificateStatusRequestV2(ssl, if (wolfSSL_UseOCSPStaplingV2(ssl,
WOLFSSL_CSR2_OCSP_MULTI, 0) WOLFSSL_CSR2_OCSP_MULTI, 0)
!= SSL_SUCCESS) != SSL_SUCCESS)
err_sys("UseCertificateStatusRequest failed"); err_sys("UseCertificateStatusRequest failed");

10
src/ssl.c
View File

@ -803,8 +803,7 @@ int wolfSSL_CTX_UseTruncatedHMAC(WOLFSSL_CTX* ctx)
#ifdef HAVE_CERTIFICATE_STATUS_REQUEST #ifdef HAVE_CERTIFICATE_STATUS_REQUEST
int wolfSSL_UseCertificateStatusRequest(WOLFSSL* ssl, byte status_type, int wolfSSL_UseOCSPStapling(WOLFSSL* ssl, byte status_type, byte options)
byte options)
{ {
if (ssl == NULL || ssl->options.side != WOLFSSL_CLIENT_END) if (ssl == NULL || ssl->options.side != WOLFSSL_CLIENT_END)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@ -814,7 +813,7 @@ int wolfSSL_UseCertificateStatusRequest(WOLFSSL* ssl, byte status_type,
} }
int wolfSSL_CTX_UseCertificateStatusRequest(WOLFSSL_CTX* ctx, byte status_type, int wolfSSL_CTX_UseOCSPStapling(WOLFSSL_CTX* ctx, byte status_type,
byte options) byte options)
{ {
if (ctx == NULL || ctx->method->side != WOLFSSL_CLIENT_END) if (ctx == NULL || ctx->method->side != WOLFSSL_CLIENT_END)
@ -828,8 +827,7 @@ int wolfSSL_CTX_UseCertificateStatusRequest(WOLFSSL_CTX* ctx, byte status_type,
#ifdef HAVE_CERTIFICATE_STATUS_REQUEST_V2 #ifdef HAVE_CERTIFICATE_STATUS_REQUEST_V2
int wolfSSL_UseCertificateStatusRequestV2(WOLFSSL* ssl, byte status_type, int wolfSSL_UseOCSPStaplingV2(WOLFSSL* ssl, byte status_type, byte options)
byte options)
{ {
if (ssl == NULL || ssl->options.side != WOLFSSL_CLIENT_END) if (ssl == NULL || ssl->options.side != WOLFSSL_CLIENT_END)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@ -839,7 +837,7 @@ int wolfSSL_UseCertificateStatusRequestV2(WOLFSSL* ssl, byte status_type,
} }
int wolfSSL_CTX_UseCertificateStatusRequestV2(WOLFSSL_CTX* ctx, int wolfSSL_CTX_UseOCSPStaplingV2(WOLFSSL_CTX* ctx,
byte status_type, byte options) byte status_type, byte options)
{ {
if (ctx == NULL || ctx->method->side != WOLFSSL_CLIENT_END) if (ctx == NULL || ctx->method->side != WOLFSSL_CLIENT_END)

8
wolfssl/ssl.h
View File

@ -1430,10 +1430,10 @@ enum {
#ifdef HAVE_CERTIFICATE_STATUS_REQUEST #ifdef HAVE_CERTIFICATE_STATUS_REQUEST
#ifndef NO_WOLFSSL_CLIENT #ifndef NO_WOLFSSL_CLIENT
WOLFSSL_API int wolfSSL_UseCertificateStatusRequest(WOLFSSL* ssl, WOLFSSL_API int wolfSSL_UseOCSPStapling(WOLFSSL* ssl,
unsigned char status_type, unsigned char options); unsigned char status_type, unsigned char options);
WOLFSSL_API int wolfSSL_CTX_UseCertificateStatusRequest(WOLFSSL_CTX* ctx, WOLFSSL_API int wolfSSL_CTX_UseOCSPStapling(WOLFSSL_CTX* ctx,
unsigned char status_type, unsigned char options); unsigned char status_type, unsigned char options);
#endif #endif
@ -1454,10 +1454,10 @@ enum {
#ifdef HAVE_CERTIFICATE_STATUS_REQUEST_V2 #ifdef HAVE_CERTIFICATE_STATUS_REQUEST_V2
#ifndef NO_WOLFSSL_CLIENT #ifndef NO_WOLFSSL_CLIENT
WOLFSSL_API int wolfSSL_UseCertificateStatusRequestV2(WOLFSSL* ssl, WOLFSSL_API int wolfSSL_UseOCSPStaplingV2(WOLFSSL* ssl,
unsigned char status_type, unsigned char options); unsigned char status_type, unsigned char options);
WOLFSSL_API int wolfSSL_CTX_UseCertificateStatusRequestV2(WOLFSSL_CTX* ctx, WOLFSSL_API int wolfSSL_CTX_UseOCSPStaplingV2(WOLFSSL_CTX* ctx,
unsigned char status_type, unsigned char options); unsigned char status_type, unsigned char options);
#endif #endif