1 files changed, 10 insertions, 9 deletions

diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c
index 7e8a1bc670..16b4b75bc4 100644
--- a/src/lib/libssl/ssl_sess.c
+++ b/src/lib/libssl/ssl_sess.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_sess.c,v 1.84 2019/04/04 14:32:49 jsing Exp $ */
+/* $OpenBSD: ssl_sess.c,v 1.85 2019/04/22 15:12:20 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -435,8 +435,7 @@ sess_id_done:
  *     to 1 if the server should issue a new session ticket (to 0 otherwise).
  */
 int
-ssl_get_prev_session(SSL *s, const unsigned char *session_id,
-    int session_id_len, CBS *ext_block)
+ssl_get_prev_session(SSL *s, CBS *session_id, CBS *ext_block)
 {
         SSL_SESSION *ret = NULL;
         int fatal = 0;
@@ -445,14 +444,14 @@ ssl_get_prev_session(SSL *s, const unsigned char *session_id,
 
         /* This is used only by servers. */
 
-        if (session_id_len > SSL_MAX_SSL_SESSION_ID_LENGTH)
+        if (CBS_len(session_id) > SSL_MAX_SSL_SESSION_ID_LENGTH)
                 goto err;
 
-        if (session_id_len == 0)
+        if (CBS_len(session_id) == 0)
                 try_session_cache = 0;
 
         /* Sets s->internal->tlsext_ticket_expected. */
-        r = tls1_process_ticket(s, session_id, session_id_len, ext_block, &ret);
+        r = tls1_process_ticket(s, session_id, ext_block, &ret);
         switch (r) {
         case -1: /* Error during processing */
                 fatal = 1;
@@ -474,9 +473,11 @@ ssl_get_prev_session(SSL *s, const unsigned char *session_id,
             !(s->session_ctx->internal->session_cache_mode &
              SSL_SESS_CACHE_NO_INTERNAL_LOOKUP)) {
                 SSL_SESSION data;
+
                 data.ssl_version = s->version;
-                data.session_id_length = session_id_len;
-                memcpy(data.session_id, session_id, session_id_len);
+                data.session_id_length = CBS_len(session_id);
+                memcpy(data.session_id, CBS_data(session_id),
+                    CBS_len(session_id));
 
                 CRYPTO_r_lock(CRYPTO_LOCK_SSL_CTX);
                 ret = lh_SSL_SESSION_retrieve(s->session_ctx->internal->sessions, &data);
@@ -496,7 +497,7 @@ ssl_get_prev_session(SSL *s, const unsigned char *session_id,
                 int copy = 1;
 
                 if ((ret = s->session_ctx->internal->get_session_cb(s,
-                    session_id, session_id_len, &copy))) {
+                    CBS_data(session_id), CBS_len(session_id), &copy))) {
                         s->session_ctx->internal->stats.sess_cb_hit++;
 
                         /*