Skip to content

build: export deprecated OpenSSL symbols on Windows - #25991

Closed
richardlau wants to merge 1 commit into
nodejs:masterfrom
richardlau:ssldef
Closed

build: export deprecated OpenSSL symbols on Windows#25991
richardlau wants to merge 1 commit into
nodejs:masterfrom
richardlau:ssldef

Conversation

@richardlau

@richardlaurichardlau commented Feb 7, 2019

Copy link
Copy Markdown
Member

Methods such as TLSv1_server_method are categorized as
DEPRECATEDIN_1_1_0. Add the deprecated categories to
the list of categories to include passed to mkssldef.py.

Adds a regression test to test/addons/openssl-binding.

Refs: #20369
Refs: #25981

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines

@nodejs-github-bot

Copy link
Copy Markdown
Collaborator

@nodejs-github-botnodejs-github-bot added the build Issues and PRs related to build files or the CI. label Feb 7, 2019
@richardlau

Copy link
Copy Markdown
MemberAuthor

For reference, this is the diff showing the symbols added by this PR to openssl.def by mkssldef.py:

$ diff -u original.openssl.def Release/obj/global_intermediate/openssl.def
--- original.openssl.def 2019-02-07 18:46:45.233187000 +0000+++ Release/obj/global_intermediate/openssl.def 2019-02-07 19:14:54.656586500 +0000@@ -112,6 +112,7 @@
ASN1_STRING_clear_free
ASN1_STRING_cmp
ASN1_STRING_copy
+ ASN1_STRING_data
ASN1_STRING_dup
ASN1_STRING_free
ASN1_STRING_get0_data
@@ -267,6 +268,7 @@
BIO_ADDR_rawmake
BIO_ADDR_rawport
BIO_ADDR_service_string
+ BIO_accept
BIO_accept_ex
BIO_asn1_get_prefix
BIO_asn1_get_suffix
@@ -307,16 +309,20 @@
BIO_find_type
BIO_free
BIO_free_all
+ BIO_get_accept_socket
BIO_get_callback
BIO_get_callback_arg
BIO_get_callback_ex
BIO_get_data
BIO_get_ex_data
+ BIO_get_host_ip
BIO_get_init
BIO_get_new_index
+ BIO_get_port
BIO_get_retry_BIO
BIO_get_retry_reason
BIO_get_shutdown
+ BIO_gethostbyname
BIO_gets
BIO_hex_string
BIO_indent
@@ -878,6 +884,7 @@
DSA_set_flags
DSA_set_method
DSA_sign
+ DSA_sign_setup
DSA_size
DSA_test_flags
DSA_up_ref
@@ -933,6 +940,7 @@
EC_GROUP_get_basis_type
EC_GROUP_get_cofactor
EC_GROUP_get_curve
+ EC_GROUP_get_curve_GFp
EC_GROUP_get_curve_name
EC_GROUP_get_degree
EC_GROUP_get_ecparameters
@@ -952,6 +960,7 @@
EC_GROUP_precompute_mult
EC_GROUP_set_asn1_flag
EC_GROUP_set_curve
+ EC_GROUP_set_curve_GFp
EC_GROUP_set_curve_name
EC_GROUP_set_generator
EC_GROUP_set_point_conversion_form
@@ -1020,6 +1029,7 @@
EC_POINT_free
EC_POINT_get_Jprojective_coordinates_GFp
EC_POINT_get_affine_coordinates
+ EC_POINT_get_affine_coordinates_GFp
EC_POINT_hex2point
EC_POINT_invert
EC_POINT_is_at_infinity
@@ -1035,7 +1045,9 @@
EC_POINT_point2oct
EC_POINT_set_Jprojective_coordinates_GFp
EC_POINT_set_affine_coordinates
+ EC_POINT_set_affine_coordinates_GFp
EC_POINT_set_compressed_coordinates
+ EC_POINT_set_compressed_coordinates_GFp
EC_POINT_set_to_infinity
EC_POINTs_make_affine
EC_POINTs_mul
@@ -1219,6 +1231,7 @@
ERR_print_errors_fp
ERR_put_error
ERR_reason_error_string
+ ERR_remove_thread_state
ERR_set_error_data
ERR_set_mark
ERR_unload_strings
@@ -1679,6 +1692,7 @@
HMAC_CTX_reset
HMAC_CTX_set_flags
HMAC_Final
+ HMAC_Init
HMAC_Init_ex
HMAC_Update
HMAC_size
@@ -1928,6 +1942,7 @@
OPENSSL_cipher_name
OPENSSL_cleanse
OPENSSL_cleanup
+ OPENSSL_config
OPENSSL_die
OPENSSL_gmtime
OPENSSL_gmtime_adj
@@ -2196,6 +2211,7 @@
PKCS12_free
PKCS12_gen_mac
PKCS12_get0_mac
+ PKCS12_get_attr
PKCS12_get_attr_gen
PKCS12_get_friendlyname
PKCS12_init
@@ -2367,6 +2383,7 @@
RAND_load_file
RAND_poll
RAND_priv_bytes
+ RAND_pseudo_bytes
RAND_seed
RAND_set_rand_engine
RAND_set_rand_method
@@ -2891,6 +2908,7 @@
SSL_set_ciphersuites
SSL_set_client_CA_list
SSL_set_connect_state
+ SSL_set_debug
SSL_set_default_passwd_cb
SSL_set_default_passwd_cb_userdata
SSL_set_default_read_buffer_len
@@ -2971,6 +2989,15 @@
TLS_client_method
TLS_method
TLS_server_method
+ TLSv1_1_client_method+ TLSv1_1_method+ TLSv1_1_server_method+ TLSv1_2_client_method+ TLSv1_2_method+ TLSv1_2_server_method+ TLSv1_client_method+ TLSv1_method+ TLSv1_server_method
TXT_DB_create_index
TXT_DB_free
TXT_DB_get_by_index
@@ -3137,7 +3164,9 @@
X509_CRL_get_ext_count
X509_CRL_get_ext_d2i
X509_CRL_get_issuer
+ X509_CRL_get_lastUpdate
X509_CRL_get_meth_data
+ X509_CRL_get_nextUpdate
X509_CRL_get_signature_nid
X509_CRL_get_version
X509_CRL_http_nbio

@richardlaurichardlau added windows Issues and PRs related to the Windows platform. openssl Issues and PRs related to the OpenSSL dependency. labels Feb 7, 2019
Methods such as `TLSv1_server_method` are categorized as
`DEPRECATEDIN_1_1_0`. Add the deprecated categories to
the list of categories to include passed to `mkssldef.py`.
Adds a regression test to `test/addons/openssl-binding`.
Refs: nodejs#20369
Refs: nodejs#25981
@richardlau

Copy link
Copy Markdown
MemberAuthor

@richardlaurichardlau added the addons Issues and PRs related to native addons. label Feb 7, 2019
@richardlau

richardlau commented Feb 8, 2019

Copy link
Copy Markdown
MemberAuthor

@richardlaurichardlau added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Feb 8, 2019
@danbev

Copy link
Copy Markdown
Contributor

Landed in fcaeb1f.

@danbevdanbev closed this Feb 11, 2019
danbev pushed a commit that referenced this pull request Feb 11, 2019
Methods such as `TLSv1_server_method` are categorized as
`DEPRECATEDIN_1_1_0`. Add the deprecated categories to
the list of categories to include passed to `mkssldef.py`.
Adds a regression test to `test/addons/openssl-binding`.
PR-URL: #25991
Refs: #20369
Refs: #25981
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
targos pushed a commit that referenced this pull request Feb 11, 2019
Methods such as `TLSv1_server_method` are categorized as
`DEPRECATEDIN_1_1_0`. Add the deprecated categories to
the list of categories to include passed to `mkssldef.py`.
Adds a regression test to `test/addons/openssl-binding`.
PR-URL: #25991
Refs: #20369
Refs: #25981
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
@targostargos mentioned this pull request Feb 14, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

addonsIssues and PRs related to native addons.author readyPRs that have at least one approval, no pending requests for changes, and a CI started.buildIssues and PRs related to build files or the CI.opensslIssues and PRs related to the OpenSSL dependency.windowsIssues and PRs related to the Windows platform.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@richardlau@nodejs-github-bot@danbev@sam-github@bnoordhuis