projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.travis.yml: introduce concept of "extended tests"
[openssl.git]
/
ssl
/
ssl_asn1.c
diff --git
a/ssl/ssl_asn1.c
b/ssl/ssl_asn1.c
index 568f41ff5b016f36f298b59a6cabe718b22d5f40..81414719151d461ff108dcc29678f98d6c1b5e3a 100644
(file)
--- a/
ssl/ssl_asn1.c
+++ b/
ssl/ssl_asn1.c
@@
-281,8
+281,8
@@
SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
goto err;
}
goto err;
}
- p = as->cipher->data;
-
id = 0x03000000L | ((unsigned long)p[0] << 8L) | (unsigned long)p
[1];
+ id = 0x03000000L | ((unsigned long)as->cipher->data[0] << 8L)
+
| (unsigned long)as->cipher->data
[1];
ret->cipher_id = id;
ret->cipher = ssl3_get_cipher_by_id(id);
ret->cipher_id = id;
ret->cipher = ssl3_get_cipher_by_id(id);
@@
-294,7
+294,7
@@
SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
goto err;
if (!ssl_session_memcpy(ret->master_key, &tmpl,
goto err;
if (!ssl_session_memcpy(ret->master_key, &tmpl,
- as->master_key,
SSL_MAX_MASTER_KEY
_LENGTH))
+ as->master_key,
TLS13_MAX_RESUMPTION_MASTER
_LENGTH))
goto err;
ret->master_key_length = tmpl;
goto err;
ret->master_key_length = tmpl;