Commit a953e836 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

s/destroy/free/g; likeness to SSL naming 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89606 13f79535-47bb-0310-9956-ffa450edef68
parent 8b8ed6ac

modules/tls/mod_tls.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static const char *tls_cert_file(cmd_parms *cmd, void *dummy, const char *arg) 


static apr_status_t tls_filter_cleanup(void *data)

{

    SSLStateMachine_destroy((SSLStateMachine *)data);

    SSLStateMachine_free((SSLStateMachine *)data);

    return APR_SUCCESS;

}

modules/tls/openssl_state_machine.c

+3 −3
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ SSLStateMachine *SSLStateMachine_new(const char *szCertificateFile, 
    if (n <= 0) {

        SSLStateMachine_print_error(pMachine,

                                    "Error opening certificate file:");

        SSLStateMachine_destroy(pMachine);

        SSLStateMachine_free(pMachine);

        return NULL;

    }
@@ -155,7 +155,7 @@ SSLStateMachine *SSLStateMachine_new(const char *szCertificateFile, 
    if (n <= 0) {

        SSLStateMachine_print_error(pMachine,

                                    "Error opening private key file:");

        SSLStateMachine_destroy(pMachine);

        SSLStateMachine_free(pMachine);

        return NULL;

    }
@@ -173,7 +173,7 @@ SSLStateMachine *SSLStateMachine_new(const char *szCertificateFile, 
    return pMachine;

    }



void SSLStateMachine_destroy(SSLStateMachine *pMachine)

void SSLStateMachine_free(SSLStateMachine *pMachine)

{

    if (pMachine->pCtx) {

        SSL_CTX_free(pMachine->pCtx);

modules/tls/openssl_state_machine.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ typedef struct SSLStateMachine SSLStateMachine; 
void SSLStateMachine_init(void);

SSLStateMachine *SSLStateMachine_new(const char *szCertificateFile,

				     const char *szKeyFile);

void SSLStateMachine_destroy(SSLStateMachine *pMachine);

void SSLStateMachine_free(SSLStateMachine *pMachine);

void SSLStateMachine_read_inject(SSLStateMachine *pMachine,

				 const unsigned char *aucBuf,int nBuf);

int SSLStateMachine_read_extract(SSLStateMachine *pMachine,