Commit 55f312e4 authored by Jacob Champion's avatar Jacob Champion
Browse files

ssl_util.c: add a couple explanatory comments 

Mark the things that are busted.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791731 13f79535-47bb-0310-9956-ffa450edef68
parent e27bbff0

modules/ssl/ssl_util.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -389,6 +389,10 @@ static unsigned long ssl_util_thr_id_internal(void) 




static void ssl_util_thr_id(CRYPTO_THREADID *id)

static void ssl_util_thr_id(CRYPTO_THREADID *id)

{

{

    /* XXX Ideally we would be using the _set_pointer() callback on platforms

     * that have a pointer-based thread "identity". But this entire API is

     * fraught with problems (see PR60947) and has been removed completely in

     * OpenSSL 1.1.0, so I'm not too invested in fixing it right now. */

    CRYPTO_THREADID_set_numeric(id, ssl_util_thr_id_internal());

    CRYPTO_THREADID_set_numeric(id, ssl_util_thr_id_internal());

}

}
@@ -404,6 +408,7 @@ static unsigned long ssl_util_thr_id(void) 
static apr_status_t ssl_util_thr_id_cleanup(void *old)

static apr_status_t ssl_util_thr_id_cleanup(void *old)

{

{

#if OPENSSL_VERSION_NUMBER >= 0x10000000L

#if OPENSSL_VERSION_NUMBER >= 0x10000000L

    /* XXX This does nothing. The new-style THREADID callback is write-once. */

    CRYPTO_THREADID_set_callback(old);

    CRYPTO_THREADID_set_callback(old);

#else

#else

    CRYPTO_set_id_callback(old);

    CRYPTO_set_id_callback(old);