Commit 03c075e5 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Windows build fixes. 



Add cmac.h to mkdef.pl
Remove ENGINE_load_rsax from engine.h: no longer built.
Update ordinals
Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent f8c03d4d

crypto/engine/engine.h

+0 −1
Original line number Diff line number Diff line
@@ -351,7 +351,6 @@ void ENGINE_load_gost(void); 
#endif

#endif

void ENGINE_load_cryptodev(void);

void ENGINE_load_rsax(void);

void ENGINE_load_rdrand(void);

void ENGINE_load_builtin_engines(void);

util/libeay.num

+220 −128

File changed.

Preview size limit exceeded, changes collapsed.

util/mkdef.pl

+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ $crypto.=" crypto/ec/ec.h" ; # unless $no_ec; 
$crypto.=" crypto/ecdsa/ecdsa.h" ; # unless $no_ecdsa;

$crypto.=" crypto/ecdh/ecdh.h" ; # unless $no_ecdh;

$crypto.=" crypto/hmac/hmac.h" ; # unless $no_hmac;

$crypto.=" crypto/cmac/cmac.h" ;



$crypto.=" crypto/engine/engine.h"; # unless $no_engine;

$crypto.=" crypto/stack/stack.h" ; # unless $no_stack;

util/ssleay.num

+55 −0
Original line number Diff line number Diff line
@@ -325,3 +325,58 @@ SSL_CTX_set_not_resumbl_sess_cb 363 EXIST:VMS:FUNCTION: 
SSL_set_not_resumable_session_callback  364	EXIST:!VMS:FUNCTION:

SSL_set_not_resumbl_sess_cb             364	EXIST:VMS:FUNCTION:

SSL_get_sigalgs                         365	EXIST::FUNCTION:TLSEXT

SSL_CTX_get_security_callback           366	EXIST::FUNCTION:

SSL_get0_param                          367	EXIST::FUNCTION:

SSL_CTX_get0_privatekey                 368	EXIST::FUNCTION:

SSL_get_shared_sigalgs                  369	EXIST::FUNCTION:TLSEXT

SSL_SESSION_print_keylog                370	EXIST::FUNCTION:BIO

SSL_CONF_CTX_finish                     371	EXIST::FUNCTION:

SSL_get0_security_ex_data               372	EXIST::FUNCTION:

DTLS_method                             373	EXIST::FUNCTION:

DTLS_client_method                      374	EXIST::FUNCTION:

SSL_CIPHER_standard_name                375	EXIST::FUNCTION:SSL_TRACE

SSL_set_alpn_protos                     376	EXIST::FUNCTION:

SSL_CONF_cmd_argv                       377	EXIST::FUNCTION:

DTLSv1_2_server_method                  378	EXIST::FUNCTION:

SSL_COMP_set0_compression_methods       379	EXIST::FUNCTION:COMP

SSL_CTX_set_cert_cb                     380	EXIST::FUNCTION:

SSL_CTX_set_custom_cli_ext              381	EXIST::FUNCTION:TLSEXT

SSL_is_server                           382	EXIST::FUNCTION:

SSL_CTX_get0_param                      383	EXIST::FUNCTION:

SSL_CONF_cmd                            384	EXIST::FUNCTION:

SSL_CTX_set_security_callback           385	EXIST::FUNCTION:

SSL_CTX_get_ssl_method                  386	EXIST::FUNCTION:

SSL_CONF_CTX_set_ssl_ctx                387	EXIST::FUNCTION:

SSL_CIPHER_find                         388	EXIST::FUNCTION:

SSL_CTX_use_serverinfo                  389	EXIST::FUNCTION:TLSEXT

SSL_get1_supported_ciphers              390	EXIST::FUNCTION:

DTLSv1_2_client_method                  391	EXIST::FUNCTION:

SSL_get0_alpn_selected                  392	EXIST::FUNCTION:

SSL_set_security_level                  393	EXIST::FUNCTION:

SSL_set0_security_ex_data               394	EXIST::FUNCTION:

SSL_CTX_set_security_level              395	EXIST::FUNCTION:

SSL_CONF_CTX_clear_flags                396	EXIST::FUNCTION:

SSL_CTX_set_alpn_protos                 397	EXIST::FUNCTION:

SSL_CTX_set_custom_srv_ext              398	EXIST::FUNCTION:TLSEXT

SSL_CTX_get0_certificate                399	EXIST::FUNCTION:

SSL_CTX_set_alpn_select_cb              400	EXIST::FUNCTION:

SSL_CONF_cmd_value_type                 401	EXIST::FUNCTION:

SSL_get_security_callback               402	EXIST::FUNCTION:

SSL_get_security_level                  403	EXIST::FUNCTION:

SSL_set_cert_cb                         404	EXIST::FUNCTION:

SSL_CTX_set0_security_ex_data           405	EXIST::FUNCTION:

SSL_CONF_CTX_set1_prefix                406	EXIST::FUNCTION:

SSL_CONF_CTX_new                        407	EXIST::FUNCTION:

SSL_CONF_CTX_set_flags                  408	EXIST::FUNCTION:

SSL_CONF_CTX_set_ssl                    409	EXIST::FUNCTION:

SSL_check_chain                         410	EXIST::FUNCTION:TLSEXT

SSL_certs_clear                         411	EXIST::FUNCTION:

SSL_CONF_CTX_free                       412	EXIST::FUNCTION:

SSL_set_security_callback               413	EXIST::FUNCTION:

SSL_trace                               414	EXIST::FUNCTION:SSL_TRACE

DTLSv1_2_method                         415	EXIST::FUNCTION:

SSL_CTX_get_security_level              416	EXIST::FUNCTION:

SSL_CTX_get0_security_ex_data           417	EXIST::FUNCTION:

DTLS_server_method                      418	EXIST::FUNCTION:

SSL_COMP_free_compression_methods       419	EXIST::FUNCTION:COMP

SSL_CTX_use_serverinfo_file             420	EXIST::FUNCTION:STDIO,TLSEXT