From: Richard Levitte Date: Wed, 11 Jul 2001 21:15:03 +0000 (+0000) Subject: make update X-Git-Tag: OpenSSL_0_9_6c~182^2~16 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b01ab143389b7a28eaacf248b64c732872b40660;p=oweals%2Fopenssl.git make update Note that since some private kssl functions were exported, the simplest way to rebuild the number table was to toss everything that was new since OpenSSL 0.9.6b. This is safe, since those functions have not yet been exported in an OpenSSL release. Beware, people who trust intermediary snapshots! --- diff --git a/ssl/Makefile.ssl b/ssl/Makefile.ssl index 4161143cbf..35a5eb5b64 100644 --- a/ssl/Makefile.ssl +++ b/ssl/Makefile.ssl @@ -48,7 +48,7 @@ LIBOBJ= \ SRC= $(LIBSRC) EXHEADER= ssl.h ssl2.h ssl3.h ssl23.h tls1.h kssl.h -HEADER= $(EXHEADER) ssl_locl.h +HEADER= $(EXHEADER) ssl_locl.h kssl_lcl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -455,7 +455,7 @@ s3_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h s3_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h s3_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h s3_clnt.o: ../include/openssl/tls1.h ../include/openssl/x509.h -s3_clnt.o: ../include/openssl/x509_vfy.h kssl.h s3_clnt.c ssl_locl.h +s3_clnt.o: ../include/openssl/x509_vfy.h kssl_lcl.h s3_clnt.c ssl_locl.h s3_enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h s3_enc.o: ../include/openssl/blowfish.h ../include/openssl/bn.h s3_enc.o: ../include/openssl/buffer.h ../include/openssl/cast.h @@ -502,8 +502,8 @@ s3_lib.o: ../include/openssl/sha.h ../include/openssl/ssl.h s3_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h s3_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h s3_lib.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -s3_lib.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s3_lib.c -s3_lib.o: ssl_locl.h +s3_lib.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h kssl_lcl.h +s3_lib.o: s3_lib.c ssl_locl.h s3_meth.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h s3_meth.o: ../include/openssl/blowfish.h ../include/openssl/bn.h s3_meth.o: ../include/openssl/buffer.h ../include/openssl/cast.h @@ -575,7 +575,7 @@ s3_srvr.o: ../include/openssl/sha.h ../include/openssl/ssl.h s3_srvr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h s3_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h s3_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h -s3_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h kssl.h +s3_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h kssl_lcl.h s3_srvr.o: s3_srvr.c ssl_locl.h ssl_algs.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h ssl_algs.o: ../include/openssl/blowfish.h ../include/openssl/bn.h @@ -743,8 +743,8 @@ ssl_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h ssl_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h ssl_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h ssl_lib.o: ../include/openssl/tls1.h ../include/openssl/x509.h -ssl_lib.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h ssl_lib.c -ssl_lib.o: ssl_locl.h +ssl_lib.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h kssl_lcl.h +ssl_lib.o: ssl_lib.c ssl_locl.h ssl_rsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h ssl_rsa.o: ../include/openssl/blowfish.h ../include/openssl/bn.h ssl_rsa.o: ../include/openssl/buffer.h ../include/openssl/cast.h diff --git a/util/ssleay.num b/util/ssleay.num index 3f6cbd9f7f..c58cd6971b 100755 --- a/util/ssleay.num +++ b/util/ssleay.num @@ -169,8 +169,8 @@ SSL_add_file_cert_subjects_to_stack 185 EXIST:!VMS:FUNCTION:STDIO SSL_add_file_cert_subjs_to_stk 185 EXIST:VMS:FUNCTION:STDIO SSL_set_tmp_rsa_callback 186 EXIST::FUNCTION:RSA SSL_set_tmp_dh_callback 187 EXIST::FUNCTION:DH -SSL_add_dir_cert_subjs_to_stk 188 NOEXIST::FUNCTION: SSL_add_dir_cert_subjects_to_stack 188 EXIST:!VMS,!WIN32:FUNCTION:STDIO +SSL_add_dir_cert_subjs_to_stk 188 NOEXIST::FUNCTION: SSL_set_session_id_context 189 EXIST::FUNCTION: SSL_CTX_use_certificate_chain_file 222 EXIST:!VMS:FUNCTION:STDIO SSL_CTX_use_cert_chain_file 222 EXIST:VMS:FUNCTION:STDIO @@ -194,26 +194,19 @@ SSL_CTX_callback_ctrl 243 EXIST::FUNCTION: SSL_callback_ctrl 244 EXIST::FUNCTION: SSL_CTX_sessions 245 EXIST::FUNCTION: kssl_cget_tkt 246 EXIST::FUNCTION:KRB5 -kssl_err_set 247 EXIST::FUNCTION:KRB5 -print_krb5_authdata 248 EXIST::FUNCTION:KRB5 +SSL_has_matching_session_id 247 EXIST::FUNCTION: +kssl_err_set 248 EXIST::FUNCTION:KRB5 kssl_ctx_show 249 EXIST::FUNCTION:KRB5 -print_krb5_keyblock 250 EXIST::FUNCTION:KRB5 -kstring 251 EXIST::FUNCTION:KRB5 +kssl_validate_times 250 EXIST::FUNCTION:KRB5 +kssl_check_authent 251 EXIST::FUNCTION:KRB5 kssl_ctx_new 252 EXIST::FUNCTION:KRB5 -knumber 253 EXIST::FUNCTION:KRB5 -kssl_sget_tkt 254 EXIST::FUNCTION:KRB5 -kssl_ctx_setkey 255 EXIST::FUNCTION:KRB5 -kssl_ctx_setprinc 256 EXIST::FUNCTION:KRB5 -kssl_ctx_free 257 EXIST::FUNCTION:KRB5 -kssl_krb5_free_data_contents 258 EXIST::FUNCTION:KRB5 -print_krb5_data 259 EXIST::FUNCTION:KRB5 -kssl_ctx_setstring 260 EXIST::FUNCTION:KRB5 -SSL_CTX_has_matching_session_id 261 NOEXIST::FUNCTION: -SSL_set_generate_session_id 262 EXIST::FUNCTION: -SSL_CTX_set_generate_session_id 263 EXIST::FUNCTION: -SSL_has_matching_session_id 264 EXIST::FUNCTION: -kssl_validate_times 265 EXIST::FUNCTION:KRB5 -kssl_check_authent 266 EXIST::FUNCTION:KRB5 -kssl_map_enc 267 EXIST::FUNCTION:KRB5 -kssl_build_principal_2 268 EXIST::FUNCTION:KRB5 -kssl_skip_confound 269 EXIST::FUNCTION:KRB5 +kssl_build_principal_2 253 EXIST::FUNCTION:KRB5 +kssl_skip_confound 254 EXIST::FUNCTION:KRB5 +kssl_sget_tkt 255 EXIST::FUNCTION:KRB5 +SSL_set_generate_session_id 256 EXIST::FUNCTION: +kssl_ctx_setkey 257 EXIST::FUNCTION:KRB5 +kssl_ctx_setprinc 258 EXIST::FUNCTION:KRB5 +kssl_ctx_free 259 EXIST::FUNCTION:KRB5 +kssl_krb5_free_data_contents 260 EXIST::FUNCTION:KRB5 +kssl_ctx_setstring 261 EXIST::FUNCTION:KRB5 +SSL_CTX_set_generate_session_id 262 EXIST::FUNCTION: