From: Dr. Stephen Henson Date: Sun, 9 Feb 2014 19:59:54 +0000 (+0000) Subject: Make upate. X-Git-Tag: OpenSSL_1_0_2-beta1~38 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=75917fac8ef2495b3e3012e08a2cf64753715e78;p=oweals%2Fopenssl.git Make upate. Revert libssl ordinals to OpenSSL 1.0.1 values first to tidy up and avoid entries for deleted functions. --- diff --git a/TABLE b/TABLE index 7a723d4b93..59ec0c808f 100644 --- a/TABLE +++ b/TABLE @@ -1525,7 +1525,7 @@ $unistd = $thread_cflag = -D_REENTRANT $sys_id = MACOSX $lflags = -Wl,-search_paths_first% -$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL +$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL $cpuid_obj = x86_64cpuid.o $bn_obj = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o $des_obj = @@ -1534,7 +1534,7 @@ $bf_obj = $md5_obj = md5-x86_64.o $sha1_obj = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o $cast_obj = -$rc4_obj = +$rc4_obj = rc4-x86_64.o rc4-md5-x86_64.o $rmd160_obj = $rc5_obj = $wp_obj = wp-x86_64.o @@ -2211,6 +2211,39 @@ $ranlib = $arflags = $multilib = +*** debug-darwin64-x86_64-cc +$cc = cc +$cflags = -arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall +$unistd = +$thread_cflag = -D_REENTRANT +$sys_id = MACOSX +$lflags = -Wl,-search_paths_first% +$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL +$cpuid_obj = x86_64cpuid.o +$bn_obj = x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o +$des_obj = +$aes_obj = aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o +$bf_obj = +$md5_obj = md5-x86_64.o +$sha1_obj = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o +$cast_obj = +$rc4_obj = rc4-x86_64.o rc4-md5-x86_64.o +$rmd160_obj = +$rc5_obj = +$wp_obj = wp-x86_64.o +$cmll_obj = cmll-x86_64.o cmll_misc.o +$modes_obj = ghash-x86_64.o aesni-gcm-x86_64.o +$engines_obj = +$perlasm_scheme = macosx +$dso_scheme = dlfcn +$shared_target= darwin-shared +$shared_cflag = -fPIC -fno-common +$shared_ldflag = -arch x86_64 -dynamiclib +$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib +$ranlib = +$arflags = +$multilib = + *** debug-geoff32 $cc = gcc $cflags = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long diff --git a/util/ssleay.num b/util/ssleay.num index 3e601c59c3..833f2b2c5f 100755 --- a/util/ssleay.num +++ b/util/ssleay.num @@ -320,52 +320,47 @@ SSL_get_srtp_profiles 360 EXIST::FUNCTION: SSL_CTX_set_next_proto_select_cb 361 EXIST:!VMS:FUNCTION:NEXTPROTONEG SSL_CTX_set_next_proto_sel_cb 361 EXIST:VMS:FUNCTION:NEXTPROTONEG SSL_SESSION_get_compress_id 362 EXIST::FUNCTION: -SSL_get_sigalgs 363 EXIST::FUNCTION:TLSEXT -SSL_get_shared_sigalgs 364 EXIST::FUNCTION:TLSEXT -SSL_use_authz 365 EXIST::FUNCTION:TLSEXT -SSL_CIPHER_standard_name 366 EXIST::FUNCTION:SSL_TRACE -SSL_CTX_set_cert_cb 367 EXIST::FUNCTION: -SSL_is_server 368 EXIST::FUNCTION: -SSL_CTX_get_authz_data 369 EXIST::FUNCTION:TLSEXT -SSL_CIPHER_find 370 EXIST::FUNCTION: -SSL_CTX_use_authz 371 EXIST::FUNCTION:TLSEXT -SSL_set_cert_cb 372 EXIST::FUNCTION: -SSL_use_authz_file 373 EXIST::FUNCTION:STDIO,TLSEXT -SSL_CTX_use_authz_file 374 EXIST::FUNCTION:STDIO,TLSEXT -SSL_SESSION_get_tlsext_authz_server_audit_proof 375 EXIST:!VMS:FUNCTION:TLSEXT -S_SES_get_tlsx_auz_srvr_aud_prf 375 EXIST:VMS:FUNCTION:TLSEXT -SSL_check_chain 376 EXIST::FUNCTION:TLSEXT -SSL_certs_clear 377 EXIST::FUNCTION: -SSL_trace 378 EXIST::FUNCTION:SSL_TRACE -SSL_CONF_cmd_argv 379 EXIST::FUNCTION: -SSL_CONF_cmd 380 EXIST::FUNCTION: +SSL_get0_param 363 EXIST::FUNCTION: +SSL_CTX_get0_privatekey 364 EXIST::FUNCTION: +SSL_get_shared_sigalgs 365 EXIST::FUNCTION:TLSEXT +SSL_CONF_CTX_finish 366 EXIST::FUNCTION: +DTLS_method 367 EXIST::FUNCTION: +DTLS_client_method 368 EXIST::FUNCTION: +SSL_CIPHER_standard_name 369 EXIST::FUNCTION:SSL_TRACE +SSL_set_alpn_protos 370 EXIST::FUNCTION: +SSL_CTX_set_srv_supp_data 371 EXIST::FUNCTION:TLSEXT +SSL_CONF_cmd_argv 372 EXIST::FUNCTION: +DTLSv1_2_server_method 373 EXIST::FUNCTION: +SSL_COMP_set0_compression_methods 374 EXIST::FUNCTION:COMP +SSL_CTX_set_cert_cb 375 EXIST::FUNCTION: +SSL_CTX_set_custom_cli_ext 376 EXIST::FUNCTION:TLSEXT +SSL_is_server 377 EXIST::FUNCTION: +SSL_CTX_get0_param 378 EXIST::FUNCTION: +SSL_CONF_cmd 379 EXIST::FUNCTION: +SSL_CTX_get_ssl_method 380 EXIST::FUNCTION: SSL_CONF_CTX_set_ssl_ctx 381 EXIST::FUNCTION: -SSL_CONF_CTX_clear_flags 382 EXIST::FUNCTION: -SSL_CONF_CTX_set1_prefix 383 EXIST::FUNCTION: -SSL_CONF_CTX_new 384 EXIST::FUNCTION: -SSL_CONF_CTX_set_flags 385 EXIST::FUNCTION: -SSL_CONF_CTX_set_ssl 386 EXIST::FUNCTION: -SSL_CONF_CTX_free 387 EXIST::FUNCTION: -SSL_CTX_get0_privatekey 388 EXIST::FUNCTION: -SSL_CONF_CTX_finish 389 EXIST::FUNCTION: -DTLS_method 390 EXIST::FUNCTION: -DTLS_client_method 391 EXIST::FUNCTION: -SSL_set_alpn_protos 392 EXIST::FUNCTION: -DTLSv1_2_server_method 393 EXIST::FUNCTION: -SSL_CTX_set_custom_cli_ext 394 EXIST::FUNCTION:TLSEXT -SSL_CTX_use_serverinfo 395 EXIST::FUNCTION:TLSEXT -DTLSv1_2_client_method 396 EXIST::FUNCTION: -SSL_get0_alpn_selected 397 EXIST::FUNCTION: -SSL_CTX_set_alpn_protos 398 EXIST::FUNCTION: -SSL_get_tlsa_record_byname 399 EXIST::FUNCTION: -SSL_CTX_set_custom_srv_ext 400 EXIST::FUNCTION:TLSEXT -SSL_CTX_get0_certificate 401 EXIST::FUNCTION: -SSL_CTX_set_alpn_select_cb 402 EXIST::FUNCTION: -SSL_CONF_cmd_value_type 403 EXIST::FUNCTION: +SSL_CIPHER_find 382 EXIST::FUNCTION: +SSL_CTX_use_serverinfo 383 EXIST::FUNCTION:TLSEXT +DTLSv1_2_client_method 384 EXIST::FUNCTION: +SSL_get0_alpn_selected 385 EXIST::FUNCTION: +SSL_CONF_CTX_clear_flags 386 EXIST::FUNCTION: +SSL_CTX_set_alpn_protos 387 EXIST::FUNCTION: +SSL_get_tlsa_record_byname 388 EXIST::FUNCTION: +SSL_CTX_set_custom_srv_ext 389 EXIST::FUNCTION:TLSEXT +SSL_CTX_get0_certificate 390 EXIST::FUNCTION: +SSL_CTX_set_alpn_select_cb 391 EXIST::FUNCTION: +SSL_CONF_cmd_value_type 392 EXIST::FUNCTION: +SSL_set_cert_cb 393 EXIST::FUNCTION: +SSL_get_sigalgs 394 EXIST::FUNCTION:TLSEXT +SSL_CONF_CTX_set1_prefix 395 EXIST::FUNCTION: +SSL_CONF_CTX_new 396 EXIST::FUNCTION: +SSL_CONF_CTX_set_flags 397 EXIST::FUNCTION: +SSL_CONF_CTX_set_ssl 398 EXIST::FUNCTION: +SSL_check_chain 399 EXIST::FUNCTION:TLSEXT +SSL_certs_clear 400 EXIST::FUNCTION: +SSL_CONF_CTX_free 401 EXIST::FUNCTION: +SSL_trace 402 EXIST::FUNCTION:SSL_TRACE +SSL_CTX_set_cli_supp_data 403 EXIST::FUNCTION:TLSEXT DTLSv1_2_method 404 EXIST::FUNCTION: DTLS_server_method 405 EXIST::FUNCTION: SSL_CTX_use_serverinfo_file 406 EXIST::FUNCTION:STDIO,TLSEXT -SSL_get0_param 407 EXIST::FUNCTION: -SSL_CTX_get0_param 408 EXIST::FUNCTION: -SSL_CTX_get_ssl_method 409 EXIST::FUNCTION: -SSL_COMP_set0_compression_methods 410 EXIST::FUNCTION:COMP