projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't write the tick_identity to the session
[openssl.git]
/
ssl
/
statem
/
extensions_srvr.c
diff --git
a/ssl/statem/extensions_srvr.c
b/ssl/statem/extensions_srvr.c
index 73ceadc34a9388d2e492e123a522fc5173aa5981..7b1c5c9eb0984fa945c77c1e3f7e39ec0929ca33 100644
(file)
--- a/
ssl/statem/extensions_srvr.c
+++ b/
ssl/statem/extensions_srvr.c
@@
-1277,7
+1277,7
@@
int tls_parse_ctos_psk(SSL *s, PACKET *pkt, unsigned int context, X509 *x,
goto err;
}
goto err;
}
- s
ess
->ext.tick_identity = id;
+ s->ext.tick_identity = id;
SSL_SESSION_free(s->session);
s->session = sess;
SSL_SESSION_free(s->session);
s->session = sess;
@@
-1951,7
+1951,7
@@
EXT_RETURN tls_construct_stoc_psk(SSL *s, WPACKET *pkt, unsigned int context,
if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_psk)
|| !WPACKET_start_sub_packet_u16(pkt)
if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_psk)
|| !WPACKET_start_sub_packet_u16(pkt)
- || !WPACKET_put_bytes_u16(pkt, s->
session->
ext.tick_identity)
+ || !WPACKET_put_bytes_u16(pkt, s->ext.tick_identity)
|| !WPACKET_close(pkt)) {
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
SSL_F_TLS_CONSTRUCT_STOC_PSK, ERR_R_INTERNAL_ERROR);
|| !WPACKET_close(pkt)) {
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
SSL_F_TLS_CONSTRUCT_STOC_PSK, ERR_R_INTERNAL_ERROR);