projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aaed77c
)
Recognise padding extension.
author
Dr. Stephen Henson
<steve@openssl.org>
Sun, 1 Jun 2014 15:25:43 +0000
(16:25 +0100)
committer
Dr. Stephen Henson
<steve@openssl.org>
Sun, 1 Jun 2014 15:50:37 +0000
(16:50 +0100)
(cherry picked from commit
ea2bb861f0daaa20819bf9ac8c146f7593feacd4
)
Conflicts:
apps/s_cb.c
(cherry picked from commit
14dc83ca779e91a267701a1fb05b2bbcf2cb63c4
)
apps/s_cb.c
patch
|
blob
|
history
diff --git
a/apps/s_cb.c
b/apps/s_cb.c
index 84c3b447c295350e852fb7a1832465513702f570..146a96079516cfbd8d7fa1ee1d9e7895e929c286 100644
(file)
--- a/
apps/s_cb.c
+++ b/
apps/s_cb.c
@@
-747,6
+747,10
@@
void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
break;
#endif
+ case TLSEXT_TYPE_padding:
+ extname = "TLS padding";
+ break;
+
default:
extname = "unknown";
break;