From 9688a0f0db467631ad566d51e37fe0f09584a103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moise=CC=81s=20Guimara=CC=83es?= <moises@wolfssl.com>
Date: Mon, 14 Dec 2015 23:12:08 -0300
Subject: [PATCH] fixes API names (marketing wise);

---
 examples/client/client.c |  6 +++---
 src/ssl.c                | 10 ++++------
 wolfssl/ssl.h            |  8 ++++----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/examples/client/client.c b/examples/client/client.c
index f96258664..db4eef7d6 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -1008,7 +1008,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
     if (statusRequest) {
         switch (statusRequest) {
             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)
                     err_sys("UseCertificateStatusRequest failed");
 
@@ -1022,13 +1022,13 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
     if (statusRequest) {
         switch (statusRequest) {
             case WOLFSSL_CSR2_OCSP:
-                if (wolfSSL_UseCertificateStatusRequestV2(ssl,
+                if (wolfSSL_UseOCSPStaplingV2(ssl,
                     WOLFSSL_CSR2_OCSP, WOLFSSL_CSR2_OCSP_USE_NONCE)
                                                                  != SSL_SUCCESS)
                     err_sys("UseCertificateStatusRequest failed");
             break;
             case WOLFSSL_CSR2_OCSP_MULTI:
-                if (wolfSSL_UseCertificateStatusRequestV2(ssl,
+                if (wolfSSL_UseOCSPStaplingV2(ssl,
                     WOLFSSL_CSR2_OCSP_MULTI, 0)
                                                                  != SSL_SUCCESS)
                     err_sys("UseCertificateStatusRequest failed");
diff --git a/src/ssl.c b/src/ssl.c
index e7cecf9f3..4ed86a84e 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -803,8 +803,7 @@ int wolfSSL_CTX_UseTruncatedHMAC(WOLFSSL_CTX* ctx)
 
 #ifdef HAVE_CERTIFICATE_STATUS_REQUEST
 
-int wolfSSL_UseCertificateStatusRequest(WOLFSSL* ssl, byte status_type,
-                                                                   byte options)
+int wolfSSL_UseOCSPStapling(WOLFSSL* ssl, byte status_type, byte options)
 {
     if (ssl == NULL || ssl->options.side != WOLFSSL_CLIENT_END)
         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)
 {
     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
 
-int wolfSSL_UseCertificateStatusRequestV2(WOLFSSL* ssl, byte status_type,
-                                                                   byte options)
+int wolfSSL_UseOCSPStaplingV2(WOLFSSL* ssl, byte status_type, byte options)
 {
     if (ssl == NULL || ssl->options.side != WOLFSSL_CLIENT_END)
         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)
 {
     if (ctx == NULL || ctx->method->side != WOLFSSL_CLIENT_END)
diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h
index 9da9c4360..728ec05e8 100644
--- a/wolfssl/ssl.h
+++ b/wolfssl/ssl.h
@@ -1430,10 +1430,10 @@ enum {
 #ifdef HAVE_CERTIFICATE_STATUS_REQUEST
 #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);
 
-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);
 
 #endif
@@ -1454,10 +1454,10 @@ enum {
 #ifdef HAVE_CERTIFICATE_STATUS_REQUEST_V2
 #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);
 
-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);
 
 #endif