summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-06-10 09:32:34 +0100
committerMatt Caswell <matt@openssl.org>2015-06-10 10:05:17 +0100
commit8b4fd12b0d1734d281994000752c771e8cd0a103 (patch)
tree653cb80142e17ce28fcb4ff44430679483d4725c
parent17689e7dc6eb006990c205083c5b07a202f50f7e (diff)
Fix Kerberos issue in ssl_session_dup
The fix for CVE-2015-1791 introduced an error in ssl_session_dup for Kerberos. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit dcad51bc13c9b716d9a66248bcc4038c071ff158)
-rw-r--r--ssl/ssl_sess.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 9baa090d82..d3bac0bb9f 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -150,7 +150,7 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket)
memcpy(dest, src, sizeof(*dest));
#ifndef OPENSSL_NO_KRB5
- dest->krb5_client_princ_len = dest->krb5_client_princ_len;
+ dest->krb5_client_princ_len = src->krb5_client_princ_len;
if (src->krb5_client_princ_len > 0)
memcpy(dest->krb5_client_princ, src->krb5_client_princ,
src->krb5_client_princ_len);