Commit 10a90ec9 authored by kelsey's avatar kelsey
Browse files

Follow changes in discovery API and libtlmsp-cfg code structure

parent 5e30c637

modules/ssl/ssl_engine_init.c

+6 −11
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ 
#include "mpm_common.h"

#include "mod_md.h"



#ifdef HAVE_TLMSP_TOOLS

#include <tlmsp-tools/libtlmsp-cfg-openssl.h>

#endif



APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ssl, SSL, int, init_server,

                                    (server_rec *s,apr_pool_t *p,int is_proxy,SSL_CTX *ctx),

                                    (s,p,is_proxy,ctx), OK, DECLINED)
@@ -556,23 +560,14 @@ static apr_status_t ssl_init_ctx_tls_extensions(server_rec *s, 


#ifdef HAVE_TLMSP_TOOLS

static int tlmsp_discovery_process(SSL *ssl,

                                   void *arg)

                                   void *arg,

                                   TLMSP_Middleboxes *middleboxes)

{

    modssl_ctx_t *mctx = arg;

    TLMSP_Middleboxes *middleboxes;

    int result;



    middleboxes = TLMSP_get_middleboxes_instance(ssl);

    if (middleboxes == NULL) {

        return (0);

    }

    result = tlmsp_cfg_process_middlebox_list_server_openssl(mctx->tlmsp_cfg,

        middleboxes);

    /* assume there were edits */

    if (!TLMSP_set_middleboxes_instance(ssl, middleboxes))

        result = 0;

    TLMSP_middleboxes_free(middleboxes);



    return (result);

}

#endif

modules/ssl/ssl_private.h

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ 
#endif



#ifdef HAVE_TLMSP_TOOLS

#include <openssl/tlmsp.h>

#include <tlmsp-tools/libtlmsp-cfg.h>

#endif