View | Details | Raw Unified | Return to bug 47055
Collapse All | Expand All

(-)ssl_engine_kernel.c.orig (-4 / +7 lines)
Lines 29-34 Link Here
29
                                  time I was too famous.''
29
                                  time I was too famous.''
30
                                            -- Unknown                */
30
                                            -- Unknown                */
31
#include "ssl_private.h"
31
#include "ssl_private.h"
32
#include "util_md5.h"
32
33
33
static void ssl_configure_env(request_rec *r, SSLConnRec *sslconn);
34
static void ssl_configure_env(request_rec *r, SSLConnRec *sslconn);
34
35
Lines 610-625 int ssl_hook_Access(request_rec *r) Link Here
610
            }
611
            }
611
        }
612
        }
612
        else {
613
        else {
613
            request_rec *id = r->main ? r->main : r;
614
            char *vhost_md5;
614
615
615
            /* do a full renegotiation */
616
            /* do a full renegotiation */
616
            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
617
            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
617
                         "Performing full renegotiation: "
618
                         "Performing full renegotiation: "
618
                         "complete handshake protocol");
619
                         "complete handshake protocol");
619
620
620
            SSL_set_session_id_context(ssl,
621
            vhost_md5 = ap_md5_binary(r->pool, (unsigned char *)sc->vhost_id,
621
                                       (unsigned char *)&id,
622
                                      sc->vhost_id_len);
622
                                       sizeof(id));
623
            
624
            SSL_set_session_id_context(ssl, (unsigned char *)vhost_md5,
625
                                       APR_MD5_DIGESTSIZE*2);
623
626
624
            SSL_renegotiate(ssl);
627
            SSL_renegotiate(ssl);
625
            SSL_do_handshake(ssl);
628
            SSL_do_handshake(ssl);

Return to bug 47055