Move basic AES ciphers into the default provider by mattcaswell · Pull Request #8700 · openssl/openssl

mattcaswell · 2019-04-08T17:15:00Z

This moves basic AES ciphers: ECB, CBC, OFB, CFB, CFB1, CFB8 and CTR, of all key sizes into the default provider.

Marked as WIP because there's a bunch of sparc and s390 specific code which still requires some attention. Also it depends on a bug fix commit from #8541.

crypto/evp/cmeth_lib.c

crypto/evp/evp_enc.c

crypto/evp/evp_lib.c

providers/common/ciphers/aes_basic.c

providers/common/ciphers/ciphers_locl.h

levitte

First quick read

crypto/err/openssl.txt

crypto/evp/digest.c

include/openssl/core_numbers.h

mattcaswell · 2019-04-10T13:18:56Z

Rebased and updated commits pushed. All comments above are either fixed or responded to.

mattcaswell · 2019-04-12T16:11:46Z

I've rebased this to address merge conflicts with master and have also made a couple of tweaks to address travis failures.

mattcaswell · 2019-04-12T18:06:51Z

Hmmm, travis doesn't like this code:

int EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *ctx, int pad)
{
    if (pad)
        ctx->flags &= ~EVP_CIPH_NO_PADDING;
    else
        ctx->flags |= EVP_CIPH_NO_PADDING;

    if (ctx->cipher != NULL && ctx->cipher->prov != NULL) {
        const OSSL_PARAM params[] = {
            OSSL_PARAM_int(OSSL_CIPHER_PARAM_PADDING, &pad),
            OSSL_PARAM_END
        };

Complains with:

crypto/evp/evp_enc.c: In function 'EVP_CIPHER_CTX_set_padding':
crypto/evp/evp_enc.c:904:35: error: initializer element is not computable at load time [-Werror=pedantic]
             OSSL_PARAM_int(OSSL_CIPHER_PARAM_PADDING, &pad),
                                   ^

Isn't that how I'm supposed to use OSSL_PARAM_int? If we can't do that then the usefulness of those macros is significantly reduced.

mattcaswell · 2019-04-12T18:40:01Z

Work arounds/fixes for a couple more travis issues pushed.

paulidale · 2019-04-13T02:24:13Z

Unless the params array is static as are all the variables referenced, at least one of the CI compilers will complain. Try this instead:

OSSL_PARAM params[2];

params[0] = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_PADDING, &pad, NULL);
params[1] = OSSL_PARAM_construct_end();

Unfortunately, the static const OSSL_PARAM array construction is likely to be lightly used because it isn’t thread safe.

include/openssl/core_numbers.h

providers/common/ciphers/ciphers_locl.h

providers/common/ciphers/aes.c

We also lay the ground work for various of other the basic AES ciphers.

mattcaswell · 2019-04-19T08:36:35Z

Pushed. Thanks!

Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

We also lay the ground work for various of other the basic AES ciphers. Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

mattcaswell added the branch: master Applies to master branch label Apr 8, 2019

richsalz reviewed Apr 8, 2019

View reviewed changes

levitte reviewed Apr 8, 2019

View reviewed changes

crypto/err/openssl.txt Outdated Show resolved Hide resolved

crypto/evp/digest.c Outdated Show resolved Hide resolved

include/openssl/core_numbers.h Outdated Show resolved Hide resolved

include/openssl/core_numbers.h Outdated Show resolved Hide resolved

levitte reviewed Apr 9, 2019

View reviewed changes

include/openssl/core_numbers.h Outdated Show resolved Hide resolved

levitte reviewed Apr 9, 2019

View reviewed changes

include/openssl/core_numbers.h Outdated Show resolved Hide resolved

mattcaswell force-pushed the provider-cipher branch from 040b363 to 00e0ac9 Compare April 10, 2019 13:18

mattcaswell mentioned this pull request Apr 11, 2019

Make the EVP API available from within the FIPS module #8728

Closed

mattcaswell force-pushed the provider-cipher branch from 00e0ac9 to 5c12a32 Compare April 12, 2019 16:09

mattcaswell force-pushed the provider-cipher branch from 5c12a32 to 6ed62c6 Compare April 12, 2019 18:39

mattcaswell force-pushed the provider-cipher branch from 6ed62c6 to c83ae43 Compare April 12, 2019 18:52

levitte reviewed Apr 14, 2019

View reviewed changes

include/openssl/core_numbers.h Outdated Show resolved Hide resolved

levitte reviewed Apr 14, 2019

View reviewed changes

include/openssl/core_numbers.h Outdated Show resolved Hide resolved

levitte reviewed Apr 14, 2019

View reviewed changes

providers/common/ciphers/ciphers_locl.h Outdated Show resolved Hide resolved

levitte requested changes Apr 15, 2019

View reviewed changes

providers/common/ciphers/aes.c Outdated Show resolved Hide resolved

mattcaswell added 11 commits April 15, 2019 15:47

Make EVP_Encrypt*/EVP_Decrypt* and EVP_Cipher* provider aware

7fef529

Implement support for AES-256-ECB in the default provider

ac9f649

We also lay the ground work for various of other the basic AES ciphers.

Add the provider_algs.h internal header file

ad8f731

Add support in the default provider for 192/128 bit AES ECB

955debb

Implement AES CBC ciphers in the default provider

94f8cdf

Implement AES OFB ciphers in the default provider

1a8d5d4

Implement AES CFB ciphers in the default provider

8809c9c

Implement AES CTR ciphers in the default provider

c00b24e

Add iv length and key length params to the cipher init calls

7bc5f38

Add a maximum output length to update and final calls

afa15af

Make implementation of blocksize, iv_length and key_length mandatory

5d5c654

mattcaswell closed this Apr 19, 2019

levitte pushed a commit that referenced this pull request Apr 19, 2019

Make EVP_Encrypt*/EVP_Decrypt* and EVP_Cipher* provider aware

df05f2c

Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

levitte pushed a commit that referenced this pull request Apr 19, 2019

Implement support for AES-256-ECB in the default provider

aab26e6

We also lay the ground work for various of other the basic AES ciphers. Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

levitte pushed a commit that referenced this pull request Apr 19, 2019

Add the provider_algs.h internal header file

861b8f8

Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

levitte pushed a commit that referenced this pull request Apr 19, 2019

Add support in the default provider for 192/128 bit AES ECB

f4a129b

Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

levitte pushed a commit that referenced this pull request Apr 19, 2019

Implement AES CBC ciphers in the default provider

718b133

Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

levitte pushed a commit that referenced this pull request Apr 19, 2019

Implement AES OFB ciphers in the default provider

ed98df5

Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

levitte pushed a commit that referenced this pull request Apr 19, 2019

Implement AES CFB ciphers in the default provider

75dd6d6

Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

levitte pushed a commit that referenced this pull request Apr 19, 2019

Implement AES CTR ciphers in the default provider

819a7ae

Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

levitte pushed a commit that referenced this pull request Apr 19, 2019

Add iv length and key length params to the cipher init calls

344cfa3

Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

levitte pushed a commit that referenced this pull request Apr 19, 2019

Add a maximum output length to update and final calls

3b94944

Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

levitte pushed a commit that referenced this pull request Apr 19, 2019

Make implementation of blocksize, iv_length and key_length mandatory

dcd446f

Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

levitte pushed a commit that referenced this pull request Apr 19, 2019

Add forward declarations of the AES dispatch table functions

3a7b15e

Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

levitte pushed a commit that referenced this pull request Apr 19, 2019

Fix the S390X support for the basic AES ciphers

64adf9a

Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

levitte pushed a commit that referenced this pull request Apr 19, 2019

Create provider errors and use them

6caf7f3

Reviewed-by: Paul Dale <[email protected]> (Merged from #8700)

Uh oh!

Conversation

mattcaswell commented Apr 8, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

levitte left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mattcaswell commented Apr 10, 2019

Uh oh!

mattcaswell commented Apr 12, 2019

Uh oh!

mattcaswell commented Apr 12, 2019

Uh oh!

mattcaswell commented Apr 12, 2019

Uh oh!

paulidale commented Apr 13, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mattcaswell commented Apr 19, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants