Commit e29d7cea authored by Matt Caswell's avatar Matt Caswell
Browse files

Ensure we set the session id context in ossl_shim 



OpenSSL requires that we set the session id context. BoringSSL apparently
does not require this, so wasn't setting it.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2942)
parent e0926ef4

test/ossl_shim/ossl_shim.cc

+5 −0
Original line number Diff line number Diff line
@@ -518,6 +518,7 @@ class SocketCloser { 
};



static bssl::UniquePtr<SSL_CTX> SetupCtx(const TestConfig *config) {

  const char sess_id_ctx[] = "ossl_shim";

  bssl::UniquePtr<SSL_CTX> ssl_ctx(SSL_CTX_new(

      config->is_dtls ? DTLS_method() : TLS_method()));

  if (!ssl_ctx) {
@@ -633,6 +634,10 @@ static bssl::UniquePtr<SSL_CTX> SetupCtx(const TestConfig *config) { 
    SSL_CTX_set_client_CA_list(ssl_ctx.get(), nullptr);

  }



  SSL_CTX_set_session_id_context(ssl_ctx.get(),

                                 (const unsigned char *)sess_id_ctx,

                                 sizeof(sess_id_ctx) - 1);



  return ssl_ctx;

}