Skip to content

Make basic AES ciphers available from within the FIPS providers#9038

Closed
mattcaswell wants to merge 4 commits intoopenssl:masterfrom
mattcaswell:fips-aes-ciphers
Closed

Make basic AES ciphers available from within the FIPS providers#9038
mattcaswell wants to merge 4 commits intoopenssl:masterfrom
mattcaswell:fips-aes-ciphers

Conversation

@mattcaswell
Copy link
Member

@mattcaswell mattcaswell commented May 29, 2019

These ciphers were already provider aware, and were available from the
default provider. We move them into the FIPS provider too.

(Needed in order to move the RAND code into the FIPS provider - see #9035)

These ciphers were already provider aware, and were available from the
default provider. We move them into the FIPS provider too.
There are various C macro definitions that are passed via the compiler
to enable AES assembler optimisation. We need to make sure that these
defines are also passed during compilation of the FIPS module.
@mattcaswell
Copy link
Member Author

Pushed a new commit to address the travis failure.

@mattcaswell
Copy link
Member Author

Spotted that I was bringing in 2 more files into the module than actually needed - so I removed those in a fixup commit.

Ping?

@mattcaswell
Copy link
Member Author

Fixup pushed to try and address the appveyor failure.

if ($target{aes_asm_src} =~ m/bsaes/) {
push @{$config{lib_defines}}, "BSAES_ASM";
push @{$config{module_defines}}, "BSAES_ASM";
}
Copy link
Member

Choose a reason for hiding this comment

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

Mental note: This makes me think that we should be able to attach the definition of these macros to the use of those files, rather than this ugly hackery.

@mattcaswell
Copy link
Member Author

Pushed. Thanks!

@mattcaswell mattcaswell closed this Jun 3, 2019
levitte pushed a commit that referenced this pull request Jun 3, 2019
These ciphers were already provider aware, and were available from the
default provider. We move them into the FIPS provider too.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #9038)
levitte pushed a commit that referenced this pull request Jun 3, 2019
There are various C macro definitions that are passed via the compiler
to enable AES assembler optimisation. We need to make sure that these
defines are also passed during compilation of the FIPS module.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #9038)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch: master Applies to master branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants