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.

Sign up for GitHub

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

Jump to bottom

All lh_stats functions were deprecated in 3.1 #22247

Closed
wants to merge 3 commits into from
Closed

All lh_stats functions were deprecated in 3.1 #22247

wants to merge 3 commits into from

Conversation

t8m
Copy link
Member

@t8m t8m commented Oct 2, 2023

This is alternative to #22245

@t8m t8m added branch: master Merge to master branch approval: review pending This pull request needs review by a committer approval: otc review pending This pull request needs review by an OTC member triaged: bug The issue/pr is/fixes a bug triaged: documentation The issue/pr deals with documentation (errors) tests: exempted The PR is exempt from requirements for testing labels Oct 2, 2023
@t8m t8m mentioned this pull request Oct 2, 2023
Closed
@t8m t8m added this to the 3.2.0 milestone Oct 2, 2023
@github-actions github-actions bot added the severity: fips change The pull request changes FIPS provider sources label Oct 2, 2023
@tom-cosgrove-arm
Copy link
Contributor

There still seem to be references to OPENSSL_NO_DEPRECATED_3_2 in crypto/lhash/lh_stats.c - is that intentional?

@mspncp
Copy link
Contributor

mspncp commented Oct 2, 2023

@t8m since the deprecation happened in 3.1, the manual pages for 3.2 and 3.1 shouldn't have unnecessary diffs.

You can just cherry-pick it backwards, preferring the master version over the 3.1 version in the conflict below, right?

I will close #22245 in favour of your PR.

msp@debian:~/src/openssl/master$ git diff
diff --cc doc/man3/OPENSSL_LH_stats.pod
index 5bc69674f8,fb95928d8f..0000000000
--- a/doc/man3/OPENSSL_LH_stats.pod
+++ b/doc/man3/OPENSSL_LH_stats.pod
@@@ -16,10 -20,6 +20,18 @@@ see L<openssl_user_macros(7)>
   void OPENSSL_LH_node_stats_bio(LHASH *table, BIO *out);
   void OPENSSL_LH_node_usage_stats_bio(LHASH *table, BIO *out);
  
++<<<<<<< HEAD
 +The following functions have been deprecated since OpenSSL 3.1, and can be
 +hidden entirely by defining B<OPENSSL_API_COMPAT> with a suitable version value,
 +see L<openssl_user_macros(7)>:
 +
++||||||| parent of ffceef6b4e (All lh_stats functions were deprecated in 3.1)
++The following functions have been deprecated since OpenSSL 3.2, and can be
++hidden entirely by defining B<OPENSSL_API_COMPAT> with a suitable version value,
++see L<openssl_user_macros(7)>:
++
++=======
++>>>>>>> ffceef6b4e (All lh_stats functions were deprecated in 3.1)
   void OPENSSL_LH_stats(LHASH *table, FILE *out);
   void OPENSSL_LH_stats_bio(LHASH *table, BIO *out);
  
@@@ -61,9 -60,6 +72,16 @@@ These calls should be made under a rea
  L<OPENSSL_LH_COMPFUNC(3)/NOTE> for more details about the locks required
  when using the LHASH data structure.
  
++<<<<<<< HEAD
 +The functions OPENSSH_LH_stats() and OPENSSH_LH_stats_bio() were deprecated in
 +version 3.1.
 +
++||||||| parent of ffceef6b4e (All lh_stats functions were deprecated in 3.1)
++The functions OPENSSH_LH_stats() and OPENSSH_LH_stats_bio() were deprecated in
++version 3.2.
++
++=======
++>>>>>>> ffceef6b4e (All lh_stats functions were deprecated in 3.1)
  =head1 SEE ALSO
  
  L<bio(7)>, L<OPENSSL_LH_COMPFUNC(3)>

@mspncp mspncp mentioned this pull request Oct 2, 2023
Closed
@mspncp
Copy link
Contributor

mspncp commented Oct 2, 2023

Commit 45ada6b has a lot of renamings from 3.1 to 3.2. Do these all need to be checked?

@t8m
Copy link
Member Author

t8m commented Oct 2, 2023

There still seem to be references to OPENSSL_NO_DEPRECATED_3_2 in crypto/lhash/lh_stats.c - is that intentional?

Nope, I did not grep properly. Fixup pushed.

@t8m
Copy link
Member Author

t8m commented Oct 2, 2023

Commit 45ada6b has a lot of renamings from 3.1 to 3.2. Do these all need to be checked?

Nope, the lhash related ones should be now covered. The others should still be kept at 3.2.

@t8m
Copy link
Member Author

t8m commented Oct 2, 2023

@mspncp There is #22248 for 3.1 branch.

mspncp
mspncp approved these changes Oct 2, 2023
View reviewed changes
Copy link
Contributor

@mspncp mspncp left a comment

Choose a reason for hiding this comment

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

Theses deprecation macros always tend to create knots in my brain.

@mspncp mspncp removed the approval: otc review pending This pull request needs review by an OTC member label Oct 2, 2023
@tom-cosgrove-arm tom-cosgrove-arm added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Oct 2, 2023
@openssl-machine openssl-machine added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Oct 3, 2023
@openssl-machine
Copy link
Collaborator

This pull request is ready to merge

@paulidale
Copy link
Contributor

Merged, thanks.

@paulidale paulidale closed this Oct 3, 2023
openssl-machine pushed a commit that referenced this pull request Oct 3, 2023
@t8m @paulidale
All lh_stats functions were deprecated in 3.1
6a92159 
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from #22247)
openssl-machine pushed a commit that referenced this pull request Oct 3, 2023
@t8m @paulidale
macros.h: There are just 3.1 deprecations, no 3.2 deprecations
6f66602 
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from #22247)
wanghao75 pushed a commit to openeuler-mirror/openssl that referenced this pull request Oct 9, 2023
@t8m
All lh_stats functions were deprecated in 3.1
509952f 
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from openssl/openssl#22247)

Signed-off-by: fly2x <fly2x@hitls.org>
wanghao75 pushed a commit to openeuler-mirror/openssl that referenced this pull request Oct 9, 2023
@t8m
macros.h: There are just 3.1 deprecations, no 3.2 deprecations
d16159b 
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from openssl/openssl#22247)

Signed-off-by: fly2x <fly2x@hitls.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mspncp mspncp mspncp approved these changes

@paulidale paulidale paulidale approved these changes

@tom-cosgrove-arm tom-cosgrove-arm tom-cosgrove-arm approved these changes

Assignees
No one assigned
Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Merge to master branch severity: fips change The pull request changes FIPS provider sources tests: exempted The PR is exempt from requirements for testing triaged: bug The issue/pr is/fixes a bug triaged: documentation The issue/pr deals with documentation (errors)
Projects
None yet
Milestone
3.2.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@t8m @tom-cosgrove-arm @mspncp @openssl-machine @paulidale