freebsd-dev/crypto/openssl/ssl
Jung-uk Kim 0c731de94c Add declaration of SSL_get_selected_srtp_profile() for OpenSSL.
Because there was an extra declaration in the vendor version, we locally
removed the second one in r238405 with 1.0.1c.  Later, upstream fixed it in
1.0.2d but they removed the first one.  Therefore, both were removed in our
version unfortunately.  Now we revert to the vendor one to re-add it.

MFC after:		3 days
Differential Revision:	https://reviews.freebsd.org/D10525
2018-01-25 23:38:05 +00:00
..
bad_dtls_test.c Merge OpenSSL 1.0.2n. 2017-12-07 18:02:57 +00:00
bio_ssl.c Merge OpenSSL 1.0.2e. 2015-12-03 21:13:35 +00:00
clienthellotest.c Merge OpenSSL 1.0.2e. 2015-12-03 21:13:35 +00:00
d1_both.c Merge OpenSSL 1.0.2l. 2017-05-25 20:52:16 +00:00
d1_clnt.c Merge OpenSSL 1.0.2l. 2017-05-25 20:52:16 +00:00
d1_lib.c Merge OpenSSL 1.0.2i. 2016-09-22 13:27:44 +00:00
d1_meth.c Merge OpenSSL 1.0.2e. 2015-12-03 21:13:35 +00:00
d1_pkt.c Merge OpenSSL 1.0.2l. 2017-05-25 20:52:16 +00:00
d1_srtp.c Merge OpenSSL 1.0.2d. 2015-10-30 20:51:33 +00:00
d1_srvr.c Merge OpenSSL 1.0.2l. 2017-05-25 20:52:16 +00:00
dtls1.h Merge OpenSSL 1.0.2d. 2015-10-30 20:51:33 +00:00
dtlstest.c Merge OpenSSL 1.0.2i. 2016-09-22 13:27:44 +00:00
fatalerrtest.c Merge OpenSSL 1.0.2n. 2017-12-07 18:02:57 +00:00
heartbeat_test.c Merge OpenSSL 1.0.2d. 2015-10-30 20:51:33 +00:00
kssl_lcl.h Merge OpenSSL 1.0.2f. 2016-01-28 20:15:22 +00:00
kssl.c Merge OpenSSL 1.0.2f. 2016-01-28 20:15:22 +00:00
kssl.h Merge OpenSSL 1.0.2f. 2016-01-28 20:15:22 +00:00
Makefile Merge OpenSSL 1.0.2n. 2017-12-07 18:02:57 +00:00
s2_clnt.c Merge OpenSSL 1.0.2i. 2016-09-22 13:27:44 +00:00
s2_enc.c Merge OpenSSL 1.0.1m. 2015-03-20 19:16:18 +00:00
s2_lib.c Merge OpenSSL 1.0.2k. 2017-01-26 19:10:29 +00:00
s2_meth.c Merge OpenSSL 1.0.2h. 2016-05-03 18:50:10 +00:00
s2_pkt.c Merge OpenSSL 1.0.2k. 2017-01-26 19:10:29 +00:00
s2_srvr.c Merge OpenSSL 1.0.2i. 2016-09-22 13:27:44 +00:00
s3_both.c Merge OpenSSL 1.0.2i. 2016-09-22 13:27:44 +00:00
s3_cbc.c Merge OpenSSL 1.0.2e. 2015-12-03 21:13:35 +00:00
s3_clnt.c Merge OpenSSL 1.0.2l. 2017-05-25 20:52:16 +00:00
s3_enc.c Merge OpenSSL 1.0.2l. 2017-05-25 20:52:16 +00:00
s3_lib.c Merge OpenSSL 1.0.2l. 2017-05-25 20:52:16 +00:00
s3_meth.c Merge OpenSSL 1.0.1m. 2015-03-20 19:16:18 +00:00
s3_pkt.c Merge OpenSSL 1.0.2n. 2017-12-07 18:02:57 +00:00
s3_srvr.c Merge OpenSSL 1.0.2m. 2017-11-02 18:04:29 +00:00
s23_clnt.c Merge OpenSSL 1.0.2n. 2017-12-07 18:02:57 +00:00
s23_lib.c Merge OpenSSL 1.0.1m. 2015-03-20 19:16:18 +00:00
s23_meth.c Merge OpenSSL 1.0.1m. 2015-03-20 19:16:18 +00:00
s23_pkt.c Merge OpenSSL 1.0.2k. 2017-01-26 19:10:29 +00:00
s23_srvr.c Merge OpenSSL 1.0.2l. 2017-05-25 20:52:16 +00:00
srtp.h Add declaration of SSL_get_selected_srtp_profile() for OpenSSL. 2018-01-25 23:38:05 +00:00
ssl2.h Merge OpenSSL 1.0.1m. 2015-03-20 19:16:18 +00:00
ssl3.h Merge OpenSSL 1.0.2d. 2015-10-30 20:51:33 +00:00
ssl23.h Merge OpenSSL 1.0.1m. 2015-03-20 19:16:18 +00:00
ssl_algs.c Merge OpenSSL 1.0.2d. 2015-10-30 20:51:33 +00:00
ssl_asn1.c Merge OpenSSL 1.0.2i. 2016-09-22 13:27:44 +00:00
ssl_cert.c Merge OpenSSL 1.0.2l. 2017-05-25 20:52:16 +00:00
ssl_ciph.c Merge OpenSSL 1.0.2m. 2017-11-02 18:04:29 +00:00
ssl_conf.c Merge OpenSSL 1.0.2g. 2016-03-01 22:08:28 +00:00
ssl_err2.c Merge OpenSSL 1.0.1m. 2015-03-20 19:16:18 +00:00
ssl_err.c Merge OpenSSL 1.0.2k. 2017-01-26 19:10:29 +00:00
ssl_lib.c Merge OpenSSL 1.0.2m. 2017-11-02 18:04:29 +00:00
ssl_locl.h Merge OpenSSL 1.0.2l. 2017-05-25 20:52:16 +00:00
ssl_rsa.c Merge OpenSSL 1.0.2l. 2017-05-25 20:52:16 +00:00
ssl_sess.c Merge OpenSSL 1.0.2m. 2017-11-02 18:04:29 +00:00
ssl_stat.c Merge OpenSSL 1.0.1n. 2015-06-11 19:00:55 +00:00
ssl_task.c Merge OpenSSL 1.0.1m. 2015-03-20 19:16:18 +00:00
ssl_txt.c Merge OpenSSL 1.0.2d. 2015-10-30 20:51:33 +00:00
ssl_utst.c Merge OpenSSL 1.0.1m. 2015-03-20 19:16:18 +00:00
ssl.h Merge OpenSSL 1.0.2n. 2017-12-07 18:02:57 +00:00
ssltest.c Merge OpenSSL 1.0.2n. 2017-12-07 18:02:57 +00:00
sslv2conftest.c Merge OpenSSL 1.0.2i. 2016-09-22 13:27:44 +00:00
t1_clnt.c Merge OpenSSL 1.0.2d. 2015-10-30 20:51:33 +00:00
t1_enc.c Merge OpenSSL 1.0.2i. 2016-09-22 13:27:44 +00:00
t1_ext.c Merge OpenSSL 1.0.2l. 2017-05-25 20:52:16 +00:00
t1_lib.c Merge OpenSSL 1.0.2n. 2017-12-07 18:02:57 +00:00
t1_meth.c Merge OpenSSL 1.0.2d. 2015-10-30 20:51:33 +00:00
t1_reneg.c Merge OpenSSL 1.0.1m. 2015-03-20 19:16:18 +00:00
t1_srvr.c Merge OpenSSL 1.0.2d. 2015-10-30 20:51:33 +00:00
t1_trce.c Merge OpenSSL 1.0.2d. 2015-10-30 20:51:33 +00:00
tls1.h Merge OpenSSL 1.0.2m. 2017-11-02 18:04:29 +00:00
tls_srp.c Merge OpenSSL 1.0.1n. 2015-06-11 19:00:55 +00:00