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

test: remove the just added, but now unrealistic, shake128 OAEP tests #24463

Closed
wants to merge 1 commit into from

Conversation

xnox
Copy link
Contributor

@xnox xnox commented May 22, 2024

These were added as a POC in #24387. However, such combinations are no
longer unusable since #24105 got merged.

This should unbreak all build failures on mainline.

Partially reverts: 1bfc8d1 (rsa-oaep: block SHAKE usage in FIPS
mode, 2024-05-13)

Signed-off-by: Dimitri John Ledkov dimitri.ledkov@surgut.co.uk

These were added as a POC in openssl#24387. However, such combinations are no
longer unusable since openssl#24105 got merged.

This should unbreak all build failures on mainline.

Partially reverts: 1bfc8d1 (rsa-oaep: block SHAKE usage in FIPS
mode, 2024-05-13)

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@surgut.co.uk>
@t8m t8m added branch: master Merge to master branch triaged: bug The issue/pr is/fixes a bug severity: urgent Fixes an urgent issue (exempt from 24h grace period) tests: exempted The PR is exempt from requirements for testing approval: review pending This pull request needs review by a committer approval: otc review pending This pull request needs review by an OTC member labels May 22, 2024
Copy link
Member

@t8m t8m left a comment

Choose a reason for hiding this comment

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

This is urgent CI fix.

@mattcaswell
Copy link
Member

Agree urgent

@mattcaswell mattcaswell added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: review pending This pull request needs review by a committer approval: otc review pending This pull request needs review by an OTC member labels May 22, 2024
Copy link
Contributor

@Sashan Sashan left a comment

Choose a reason for hiding this comment

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

I can confirm applying change gets evp test going.
before:

lifty$ make run_tests TESTS=test_evp       
( SRCTOP=.  BLDTOP=.  PERL="perl"  FIPSKEY="f4556650ac31d35461610bac4ed81b1a181b2d8a43ea2854cbae22ca74560813"  EXE_EXT=  perl ./test/run_tests.pl test_evp )
00-prep_fipsmodule_cnf.t .. skipped: FIPS module config file only supported in a fips build
Files=1, Tests=0,  0 wallclock secs ( 0.01 usr  0.00 sys +  0.09 cusr  0.07 csys =  0.17 CPU)
Result: NOTESTS
30-test_evp.t .. 7/? 
        # INFO:  @ test/testutil/stanza.c:21
</snip>
# ------------------------------------------------------------------------------
    # OPENSSL_TEST_RAND_SEED=1716389574
    not ok 1 - run_file_tests
# ------------------------------------------------------------------------------
../../util/wrap.pl ../../test/evp_test -config ../../test/default-and-legacy.cnf ../../test/recipes/30-test_evp_data/evppkey_rsa_common.txt => 1
not ok 22 - running evp_test -config ../../test/default-and-legacy.cnf evppkey_rsa_common.txt
30-test_evp.t .. 73/? ----------------------------------------------------------
30-test_evp.t .. Dubious, test returned 1 (wstat 256, 0x100)
Failed 1/80 subtests 
        (less 3 skipped subtests: 76 okay)

Test Summary Report
-------------------
30-test_evp.t (Wstat: 256 (exited 1) Tests: 80 Failed: 1)
  Failed test:  22
  Non-zero exit status: 1
Files=1, Tests=80,  5 wallclock secs ( 0.50 usr  0.01 sys +  3.20 cusr  1.71 csys =  5.42 CPU)
Result: FAIL
*** Error 1 in /home/sashan/work.openssl/QUIC/openssl.addr_validation (Makefile:3767 'run_tests')

after diff presented here is applied:

lifty$ make run_tests TESTS=test_evp                             
( SRCTOP=.  BLDTOP=.  PERL="perl"  FIPSKEY="f4556650ac31d35461610bac4ed81b1a181b2d8a43ea2854cbae22ca74560813"  EXE_EXT=  perl ./test/run_tests.pl test_evp )
00-prep_fipsmodule_cnf.t .. skipped: FIPS module config file only supported in a fips build
Files=1, Tests=0,  0 wallclock secs ( 0.01 usr  0.00 sys +  0.10 cusr  0.05 csys =  0.16 CPU)
Result: NOTESTS
30-test_evp.t .. ok    
All tests successful.
Files=1, Tests=80,  5 wallclock secs ( 0.38 usr  0.04 sys +  3.27 cusr  1.34 csys =  5.03 CPU)
Result: PASS

@xnox
Copy link
Contributor Author

xnox commented May 22, 2024

Very sorry about this - as two branches independently pass testing, but not when merged together.

@t8m
Copy link
Member

t8m commented May 22, 2024

@xnox Don't be sorry, not your fault.

@t8m
Copy link
Member

t8m commented May 22, 2024

Merged to the master branch. Thank you for the prompt fix.

@t8m t8m closed this May 22, 2024
openssl-machine pushed a commit that referenced this pull request May 22, 2024
These were added as a POC in #24387. However, such combinations are no
longer unusable since #24105 got merged.

This should unbreak all build failures on mainline.

Partially reverts: 1bfc8d1 (rsa-oaep: block SHAKE usage in FIPS
mode, 2024-05-13)

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@surgut.co.uk>

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #24463)
jvdsn pushed a commit to jvdsn/openssl that referenced this pull request Jun 3, 2024
These were added as a POC in openssl#24387. However, such combinations are no
longer unusable since openssl#24105 got merged.

This should unbreak all build failures on mainline.

Partially reverts: 1bfc8d1 (rsa-oaep: block SHAKE usage in FIPS
mode, 2024-05-13)

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@surgut.co.uk>

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from openssl#24463)
xnox added a commit to xnox/openssl that referenced this pull request Jun 24, 2024
These were added as a POC in openssl#24387. However, such combinations are no
longer unusable since openssl#24105 got merged.

This should unbreak all build failures on mainline.

Partially reverts: 1bfc8d1 (rsa-oaep: block SHAKE usage in FIPS
mode, 2024-05-13)

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@surgut.co.uk>

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from openssl#24463)

(cherry picked from commit a0da3cb)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Merge to master branch severity: urgent Fixes an urgent issue (exempt from 24h grace period) tests: exempted The PR is exempt from requirements for testing triaged: bug The issue/pr is/fixes a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants