projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update FAQ
[openssl.git]
/
apps
/
s_cb.c
diff --git
a/apps/s_cb.c
b/apps/s_cb.c
index 927f9d91e1e8c103092c4f23f94930e87f1600b5..083956916c790580b84b4d8106a2026902506900 100644
(file)
--- a/
apps/s_cb.c
+++ b/
apps/s_cb.c
@@
-876,12
+876,12
@@
void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
case 16:
str_details1 = ", ClientKeyExchange";
break;
case 16:
str_details1 = ", ClientKeyExchange";
break;
- case 23:
- str_details1 = ", SupplementalData";
- break;
case 20:
str_details1 = ", Finished";
break;
case 20:
str_details1 = ", Finished";
break;
+ case 23:
+ str_details1 = ", SupplementalData";
+ break;
}
}
}
}
}
}
@@
-1023,6
+1023,11
@@
void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
extname = "next protocol";
break;
#endif
extname = "next protocol";
break;
#endif
+#ifdef TLSEXT_TYPE_encrypt_then_mac
+ case TLSEXT_TYPE_encrypt_then_mac:
+ extname = "encrypt-then-mac";
+ break;
+#endif
default:
extname = "unknown";
default:
extname = "unknown";
@@
-1680,6
+1685,12
@@
int args_ssl_call(SSL_CTX *ctx, BIO *err, SSL_CONF_CTX *cctx,
}
}
#endif
}
}
#endif
+ if (!SSL_CONF_CTX_finish(cctx))
+ {
+ BIO_puts(err, "Error finishing context\n");
+ ERR_print_errors(err);
+ return 0;
+ }
return 1;
}
return 1;
}