Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools: make mkssldef ignore DEPRECATEDIN #24329

Closed
wants to merge 1 commit into from

Conversation

refack
Copy link
Contributor

@refack refack commented Nov 13, 2018

Make mkssldef ignore deprecation. e.g. TLSv1_2_* that were deprecated in openSSL_1_1:

TLSv1_server_method 158 1_1_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0,TLS1_METHOD

Fixes: #20369

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines

@nodejs-github-bot nodejs-github-bot added openssl Issues and PRs related to the OpenSSL dependency. tls Issues and PRs related to the tls subsystem. tools Issues and PRs related to the tools directory. labels Nov 13, 2018
@refack refack added windows Issues and PRs related to the Windows platform. build Issues and PRs related to build files or the CI. labels Nov 13, 2018
@refack
Copy link
Contributor Author

refack commented Nov 13, 2018

/CC @nodejs/python @nodejs/build-files @nodejs/crypto

CI: https://ci.nodejs.org/job/node-test-pull-request/18564/

Copy link
Member

@bnoordhuis bnoordhuis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with a comment.

@@ -33,6 +33,8 @@
assert meta[2] in ('FUNCTION', 'VARIABLE')
if meta[0] != 'EXIST': continue
if meta[2] != 'FUNCTION': continue
# In cases where meta[3] is 'DEPRECATEDIN_X_Y,CATEGORY'
meta[3] = meta[3].split(',')[-1]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you check that the zeroth field is what you expect it to be?

if ',' in meta[3]:
  fst, meta[3] = meta[3].split(',')
  assert fst.startswith('DEPRECATEDIN')

The above assumes at most two fields. You could also filter out all deprecation tags:

words = meta[3].split(',')
words = [word for word in words if not word.startswith('DEPRECATEDIN')]
assert len(words) == 1
meta[3] = words.pop()

@richardlau
Copy link
Member

Maybe add the testcase from #20369?

@refack refack closed this Dec 21, 2018
@refack refack deleted the mkssldef-ignore-deprecation branch December 21, 2018 01:13
@refack refack restored the mkssldef-ignore-deprecation branch January 22, 2019 21:42
@richardlau
Copy link
Member

Since this didn't land, I've opened an alternative PR which adds the deprecated categories to the list of categories to export (rather than trying to ignore them): #25991.

@refack refack deleted the mkssldef-ignore-deprecation branch February 7, 2019 19:46
@refack refack restored the mkssldef-ignore-deprecation branch March 11, 2019 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Issues and PRs related to build files or the CI. openssl Issues and PRs related to the OpenSSL dependency. tls Issues and PRs related to the tls subsystem. tools Issues and PRs related to the tools directory. windows Issues and PRs related to the Windows platform.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missing exports : TLSv1_2_client_method, TLSv1_2_server_method
4 participants