projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix setting of ssl_strings_inited.
[openssl.git]
/
ssl
/
ssl_txt.c
diff --git
a/ssl/ssl_txt.c
b/ssl/ssl_txt.c
index c17d33a5512de38a7ca4e4c85ba5803f81ec5e57..cf6e4c3c05799f9199f8f6a03e4cc5ea8dc7e504 100644
(file)
--- a/
ssl/ssl_txt.c
+++ b/
ssl/ssl_txt.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 1995-201
6
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-201
8
The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2005 Nokia. All rights reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* Copyright 2005 Nokia. All rights reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
@@
-20,12
+20,12
@@
int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x)
if ((b = BIO_new(BIO_s_file())) == NULL) {
SSLerr(SSL_F_SSL_SESSION_PRINT_FP, ERR_R_BUF_LIB);
if ((b = BIO_new(BIO_s_file())) == NULL) {
SSLerr(SSL_F_SSL_SESSION_PRINT_FP, ERR_R_BUF_LIB);
- return
(0)
;
+ return
0
;
}
BIO_set_fp(b, fp, BIO_NOCLOSE);
ret = SSL_SESSION_print(b, x);
BIO_free(b);
}
BIO_set_fp(b, fp, BIO_NOCLOSE);
ret = SSL_SESSION_print(b, x);
BIO_free(b);
- return
(ret)
;
+ return
ret
;
}
#endif
}
#endif
@@
-33,9
+33,11
@@
int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
{
size_t i;
const char *s;
{
size_t i;
const char *s;
+ int istls13;
if (x == NULL)
goto err;
if (x == NULL)
goto err;
+ istls13 = (x->ssl_version == TLS1_3_VERSION);
if (BIO_puts(bp, "SSL-Session:\n") <= 0)
goto err;
s = ssl_protocol_to_string(x->ssl_version);
if (BIO_puts(bp, "SSL-Session:\n") <= 0)
goto err;
s = ssl_protocol_to_string(x->ssl_version);
@@
-44,18
+46,18
@@
int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
if (x->cipher == NULL) {
if (((x->cipher_id) & 0xff000000) == 0x02000000) {
if (x->cipher == NULL) {
if (((x->cipher_id) & 0xff000000) == 0x02000000) {
- if (BIO_printf
-
(bp, " Cipher : %06lX\n",
x->cipher_id & 0xffffff) <= 0)
+ if (BIO_printf
(bp, " Cipher : %06lX\n",
+
x->cipher_id & 0xffffff) <= 0)
goto err;
} else {
goto err;
} else {
- if (BIO_printf
-
(bp, " Cipher : %04lX\n",
x->cipher_id & 0xffff) <= 0)
+ if (BIO_printf
(bp, " Cipher : %04lX\n",
+
x->cipher_id & 0xffff) <= 0)
goto err;
}
} else {
goto err;
}
} else {
- if (BIO_printf
- (bp, " Cipher : %s\n",
-
((x->cipher == NULL) ? "unknown"
: x->cipher->name)) <= 0)
+ if (BIO_printf
(bp, " Cipher : %s\n",
+ ((x->cipher->name == NULL) ? "unknown"
+
: x->cipher->name)) <= 0)
goto err;
}
if (BIO_puts(bp, " Session-ID: ") <= 0)
goto err;
}
if (BIO_puts(bp, " Session-ID: ") <= 0)
@@
-70,7
+72,10
@@
int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
if (BIO_printf(bp, "%02X", x->sid_ctx[i]) <= 0)
goto err;
}
if (BIO_printf(bp, "%02X", x->sid_ctx[i]) <= 0)
goto err;
}
- if (BIO_puts(bp, "\n Master-Key: ") <= 0)
+ if (istls13) {
+ if (BIO_puts(bp, "\n Resumption PSK: ") <= 0)
+ goto err;
+ } else if (BIO_puts(bp, "\n Master-Key: ") <= 0)
goto err;
for (i = 0; i < x->master_key_length; i++) {
if (BIO_printf(bp, "%02X", x->master_key[i]) <= 0)
goto err;
for (i = 0; i < x->master_key_length; i++) {
if (BIO_printf(bp, "%02X", x->master_key[i]) <= 0)
@@
-145,9
+150,15
@@
int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
x->flags & SSL_SESS_FLAG_EXTMS ? "yes" : "no") <= 0)
goto err;
x->flags & SSL_SESS_FLAG_EXTMS ? "yes" : "no") <= 0)
goto err;
+ if (istls13) {
+ if (BIO_printf(bp, " Max Early Data: %u\n",
+ x->ext.max_early_data) <= 0)
+ goto err;
+ }
+
return 1;
err:
return 1;
err:
- return
(0)
;
+ return
0
;
}
/*
}
/*
@@
-188,5
+199,5
@@
int SSL_SESSION_print_keylog(BIO *bp, const SSL_SESSION *x)
return 1;
err:
return 1;
err:
- return
(0)
;
+ return
0
;
}
}