CVS commit: src/crypto/external/bsd/openssl/lib/libssl
Module Name:src
Committed By: christos
Date: Mon Oct 8 18:01:23 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libssl: Makefile
Log Message:
elide a warning that triggers on arm/clang
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssl/lib/libssl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libssl/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.9 src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.10
--- src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.9 Fri Mar 2 08:26:40 2018
+++ src/crypto/external/bsd/openssl/lib/libssl/Makefile Mon Oct 8 14:01:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/03/02 13:26:40 christos Exp $
+# $NetBSD: Makefile,v 1.10 2018/10/08 18:01:23 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -23,6 +23,8 @@ USE_FORT?=yes # cryptographic software a
# XXX There's a bit of work to do before we can enable warnings.
WARNS=0
CWARNFLAGS.clang+= -Wno-unused-value
+# XXX: This warning seems to trigger incorrectly
+CWARNFLAGS.clang+= -Wno-atomic-alignment
LIB= ssl
CPPFLAGS+= -Dlib${LIB} -I${OPENSSLSRC} -I${OPENSSLSRC}/crypto
CVS commit: src/crypto/external/bsd/openssl/lib/libssl
Module Name:src
Committed By: christos
Date: Fri Mar 2 13:26:40 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libssl: Makefile
Log Message:
Remove unused part of the Makefile (Muhammed.Shameem)
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssl/lib/libssl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libssl/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.8 src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.9
--- src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.8 Thu Feb 8 17:51:06 2018
+++ src/crypto/external/bsd/openssl/lib/libssl/Makefile Fri Mar 2 08:26:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/02/08 22:51:06 christos Exp $
+# $NetBSD: Makefile,v 1.9 2018/03/02 13:26:40 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -43,17 +43,6 @@ AFLAGS+=-DELF
INCS= dtls1.h ssl.h ssl2.h ssl3.h tls1.h srtp.h async.h
INCSDIR=/usr/include/openssl
-# this rebuilds the `srcs.inc' and the .inc files it reads.
-# note that we have no idea, rc5 or rsa here so we include
-# them explicitly above if we are using these ciphers.
-# XXX
-# we patch `ssl.inc' as we need to be able to turn off SSLv2.
-update_inc:
- (cd ${.CURDIR}; \
- find ${OPENSSLSRC}/ssl -name Makefile | \
- perl ${OPENSSLSRC}/extsrcs.pl 2> srcs.inc; \
- patch -s ssl.inc < ssl.diff )
-
LDFLAGS+=-Wl,--version-script=${.CURDIR}/ssl.map
PKGCONFIG=libssl openssl
CVS commit: src/crypto/external/bsd/openssl/lib/libssl
Module Name:src
Committed By: christos
Date: Thu Feb 8 22:51:06 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libssl: Makefile
Log Message:
use the right map file
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssl/lib/libssl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libssl/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.7 src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.8
--- src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.7 Thu Feb 8 17:49:14 2018
+++ src/crypto/external/bsd/openssl/lib/libssl/Makefile Thu Feb 8 17:51:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/02/08 22:49:14 christos Exp $
+# $NetBSD: Makefile,v 1.8 2018/02/08 22:51:06 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -54,7 +54,7 @@ update_inc:
perl ${OPENSSLSRC}/extsrcs.pl 2> srcs.inc; \
patch -s ssl.inc < ssl.diff )
-LDFLAGS+=-Wl,--version-script=${.CURDIR}/crypto.map
+LDFLAGS+=-Wl,--version-script=${.CURDIR}/ssl.map
PKGCONFIG=libssl openssl
.include "${.CURDIR}/../../pkgconfig.mk"
CVS commit: src/crypto/external/bsd/openssl/lib/libssl
Module Name:src
Committed By: christos
Date: Thu Feb 8 22:49:15 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libssl: Makefile
Added Files:
src/crypto/external/bsd/openssl/lib/libssl: ssl.map
Log Message:
Add a linker script
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/lib/libssl/Makefile
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/lib/libssl/ssl.map
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libssl/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.6 src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.7
--- src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.6 Thu Feb 8 16:57:29 2018
+++ src/crypto/external/bsd/openssl/lib/libssl/Makefile Thu Feb 8 17:49:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/02/08 21:57:29 christos Exp $
+# $NetBSD: Makefile,v 1.7 2018/02/08 22:49:14 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -54,6 +54,8 @@ update_inc:
perl ${OPENSSLSRC}/extsrcs.pl 2> srcs.inc; \
patch -s ssl.inc < ssl.diff )
+LDFLAGS+=-Wl,--version-script=${.CURDIR}/crypto.map
+
PKGCONFIG=libssl openssl
.include "${.CURDIR}/../../pkgconfig.mk"
Added files:
Index: src/crypto/external/bsd/openssl/lib/libssl/ssl.map
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libssl/ssl.map:1.1
--- /dev/null Thu Feb 8 17:49:15 2018
+++ src/crypto/external/bsd/openssl/lib/libssl/ssl.map Thu Feb 8 17:49:14 2018
@@ -0,0 +1,411 @@
+OPENSSL_1_1_0 {
+global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;
+BIO_new_ssl;
+BIO_new_ssl_connect;
+BIO_ssl_copy_session_id;
+BIO_ssl_shutdown;
+DTLS_client_method;
+DTLS_method;
+DTLS_server_method;
+DTLSv1_2_client_method;
+DTLSv1_2_method;
+DTLSv1_2_server_method;
+DTLSv1_client_method;
+DTLSv1_listen;
+DTLSv1_method;
+DTLSv1_server_method;
+ERR_load_SSL_strings;
+OPENSSL_init_ssl;
+PEM_read_SSL_SESSION;
+PEM_read_bio_SSL_SESSION;
+PEM_write_SSL_SESSION;
+PEM_write_bio_SSL_SESSION;
+SRP_Calc_A_param;
+SSL_CIPHER_description;
+SSL_CIPHER_find;
+SSL_CIPHER_get_auth_nid;
+SSL_CIPHER_get_bits;
+SSL_CIPHER_get_cipher_nid;
+SSL_CIPHER_get_digest_nid;
+SSL_CIPHER_get_id;
+SSL_CIPHER_get_kx_nid;
+SSL_CIPHER_get_name;
+SSL_CIPHER_get_version;
+SSL_CIPHER_is_aead;
+SSL_COMP_add_compression_method;
+SSL_COMP_get_compression_methods;
+SSL_COMP_get_name;
+SSL_COMP_set0_compression_methods;
+SSL_CONF_CTX_clear_flags;
+SSL_CONF_CTX_finish;
+SSL_CONF_CTX_free;
+SSL_CONF_CTX_new;
+SSL_CONF_CTX_set1_prefix;
+SSL_CONF_CTX_set_flags;
+SSL_CONF_CTX_set_ssl;
+SSL_CONF_CTX_set_ssl_ctx;
+SSL_CONF_cmd;
+SSL_CONF_cmd_argv;
+SSL_CONF_cmd_value_type;
+SSL_CTX_SRP_CTX_free;
+SSL_CTX_SRP_CTX_init;
+SSL_CTX_add_client_CA;
+SSL_CTX_add_client_custom_ext;
+SSL_CTX_add_server_custom_ext;
+SSL_CTX_add_session;
+SSL_CTX_callback_ctrl;
+SSL_CTX_check_private_key;
+SSL_CTX_clear_options;
+SSL_CTX_config;
+SSL_CTX_ct_is_enabled;
+SSL_CTX_ctrl;
+SSL_CTX_dane_clear_flags;
+SSL_CTX_dane_enable;
+SSL_CTX_dane_mtype_set;
+SSL_CTX_dane_set_flags;
+SSL_CTX_enable_ct;
+SSL_CTX_flush_sessions;
+SSL_CTX_free;
+SSL_CTX_get0_certificate;
+SSL_CTX_get0_ctlog_store;
+SSL_CTX_get0_param;
+SSL_CTX_get0_privatekey;
+SSL_CTX_get0_security_ex_data;
+SSL_CTX_get_cert_store;
+SSL_CTX_get_ciphers;
+SSL_CTX_get_client_CA_list;
+SSL_CTX_get_client_cert_cb;
+SSL_CTX_get_default_passwd_cb;
+SSL_CTX_get_default_passwd_cb_userdata;
+SSL_CTX_get_ex_data;
+SSL_CTX_get_info_callback;
+SSL_CTX_get_options;
+SSL_CTX_get_quiet_shutdown;
+SSL_CTX_get_security_callback;
+SSL_CTX_get_security_level;
+SSL_CTX_get_ssl_method;
+SSL_CTX_get_timeout;
+SSL_CTX_get_verify_callback;
+SSL_CTX_get_verify_depth;
+SSL_CTX_get_verify_mode;
+SSL_CTX_has_client_custom_ext;
+SSL_CTX_load_verify_locations;
+SSL_CTX_new;
+SSL_CTX_remove_session;
+SSL_CTX_sess_get_get_cb;
+SSL_CTX_sess_get_new_cb;
+SSL_CTX_sess_get_remove_cb;
+SSL_CTX_sess_set_get_cb;
+SSL_CTX_sess_set_new_cb;
+SSL_CTX_sess_set_remove_cb;
+SSL_CTX_sessions;
+SSL_CTX_set0_ctlog_store;
+
CVS commit: src/crypto/external/bsd/openssl/lib/libssl
Module Name:src Committed By: wiz Date: Fri Mar 21 13:07:57 UTC 2014 Modified Files: src/crypto/external/bsd/openssl/lib/libssl: ssl.inc Log Message: Add d1_meth.c to build to fix problems with missing symbol DTLSv1_method. Addresses asterisk build problems, idea for fix from martin. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/lib/libssl/ssl.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/lib/libssl/ssl.inc diff -u src/crypto/external/bsd/openssl/lib/libssl/ssl.inc:1.5 src/crypto/external/bsd/openssl/lib/libssl/ssl.inc:1.6 --- src/crypto/external/bsd/openssl/lib/libssl/ssl.inc:1.5 Wed Feb 6 17:03:51 2013 +++ src/crypto/external/bsd/openssl/lib/libssl/ssl.inc Fri Mar 21 13:07:57 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ssl.inc,v 1.5 2013/02/06 17:03:51 christos Exp $ +# $NetBSD: ssl.inc,v 1.6 2014/03/21 13:07:57 wiz Exp $ # # @(#) Copyright (c) 1995 Simon J. Gerraty # @@ -16,7 +16,7 @@ CPPFLAGS+= -DNO_SSL2 .endif SRCS+= bio_ssl.c -SRCS+= d1_both.c d1_clnt.c d1_enc.c d1_lib.c d1_pkt.c d1_srtp.c d1_srvr.c +SRCS+= d1_both.c d1_clnt.c d1_enc.c d1_lib.c d1_meth.c d1_pkt.c d1_srtp.c d1_srvr.c SRCS+= kssl.c SRCS+= s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c SRCS+= s3_both.c s3_cbc.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c s3_pkt.c \
CVS commit: src/crypto/external/bsd/openssl/lib/libssl
Module Name:src Committed By: christos Date: Fri Mar 21 16:59:14 UTC 2014 Modified Files: src/crypto/external/bsd/openssl/lib/libssl: shlib_version Log Message: bump for previous To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/lib/libssl/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/lib/libssl/shlib_version diff -u src/crypto/external/bsd/openssl/lib/libssl/shlib_version:1.8 src/crypto/external/bsd/openssl/lib/libssl/shlib_version:1.9 --- src/crypto/external/bsd/openssl/lib/libssl/shlib_version:1.8 Sat Jan 11 13:34:37 2014 +++ src/crypto/external/bsd/openssl/lib/libssl/shlib_version Fri Mar 21 12:59:14 2014 @@ -1,5 +1,5 @@ -# $NetBSD: shlib_version,v 1.8 2014/01/11 18:34:37 christos Exp $ +# $NetBSD: shlib_version,v 1.9 2014/03/21 16:59:14 christos Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing # major=10 -minor=2 +minor=3
CVS commit: src/crypto/external/bsd/openssl/lib/libssl
Module Name:src Committed By: christos Date: Wed Feb 6 17:03:51 UTC 2013 Modified Files: src/crypto/external/bsd/openssl/lib/libssl: ssl.inc Log Message: reorg and add missing file. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/lib/libssl/ssl.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/lib/libssl/ssl.inc diff -u src/crypto/external/bsd/openssl/lib/libssl/ssl.inc:1.4 src/crypto/external/bsd/openssl/lib/libssl/ssl.inc:1.5 --- src/crypto/external/bsd/openssl/lib/libssl/ssl.inc:1.4 Thu Jul 26 15:58:42 2012 +++ src/crypto/external/bsd/openssl/lib/libssl/ssl.inc Wed Feb 6 12:03:51 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ssl.inc,v 1.4 2012/07/26 19:58:42 christos Exp $ +# $NetBSD: ssl.inc,v 1.5 2013/02/06 17:03:51 christos Exp $ # # @(#) Copyright (c) 1995 Simon J. Gerraty # @@ -15,12 +15,13 @@ SRCS+= s2_meth.c s2_srvr.c s2_clnt.c CPPFLAGS+= -DNO_SSL2 .endif -SRCS+= s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \ - s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c \ - t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c t1_reneg.c \ - tls_srp.c \ - ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \ - ssl_ciph.c ssl_stat.c ssl_rsa.c \ - ssl_asn1.c ssl_txt.c ssl_algs.c \ - bio_ssl.c ssl_err.c kssl.c d1_clnt.c d1_srvr.c d1_lib.c d1_both.c \ - d1_pkt.c d1_enc.c d1_srtp.c +SRCS+= bio_ssl.c +SRCS+= d1_both.c d1_clnt.c d1_enc.c d1_lib.c d1_pkt.c d1_srtp.c d1_srvr.c +SRCS+= kssl.c +SRCS+= s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c +SRCS+= s3_both.c s3_cbc.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c s3_pkt.c \ + s3_srvr.c +SRCS+= ssl_algs.c ssl_asn1.c ssl_cert.c ssl_ciph.c ssl_err.c ssl_err2.c \ + ssl_lib.c ssl_rsa.c ssl_sess.c ssl_stat.c ssl_txt.c +SRCS+= t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_reneg.c t1_srvr.c +SRCS+= tls_srp.c
