Skip to content

Commit

Permalink
Add a test case for the engine crash with AES-256-CTR
Browse files Browse the repository at this point in the history 
Implement the AES-256-CTR cipher in the dasync engine.

Use that to reproduce the reported problems with the
devcrypto engine in our normal test environment.

See #17995 and #17532 for details.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #19386)

(cherry picked from commit bd363ef)
  • Loading branch information
@bernd-edlinger @t8m
bernd-edlinger authored and t8m committed Nov 22, 2022
1 parent e4d8eaa commit 872dd0a
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 1 deletion.
67 changes: 67 additions & 0 deletions engines/e_dasync.c
View file
Expand Up @@ -139,6 +139,14 @@ static int dasync_aes128_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t inl);
static int dasync_aes128_cbc_cleanup(EVP_CIPHER_CTX *ctx);

static int dasync_aes256_ctr_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
void *ptr);
static int dasync_aes256_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc);
static int dasync_aes256_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t inl);
static int dasync_aes256_ctr_cleanup(EVP_CIPHER_CTX *ctx);

static int dasync_aes128_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
int arg, void *ptr);
static int dasync_aes128_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx,
Expand Down Expand Up @@ -171,6 +179,12 @@ static const EVP_CIPHER *dasync_aes_128_cbc(void)
return _hidden_aes_128_cbc;
}

static EVP_CIPHER *_hidden_aes_256_ctr = NULL;
static const EVP_CIPHER *dasync_aes_256_ctr(void)
{
return _hidden_aes_256_ctr;
}

/*
* Holds the EVP_CIPHER object for aes_128_cbc_hmac_sha1 in this engine. Set up
* once only during engine bind and can then be reused many times.
Expand All @@ -192,8 +206,10 @@ static const EVP_CIPHER *dasync_aes_128_cbc_hmac_sha1(void)
static void destroy_ciphers(void)
{
EVP_CIPHER_meth_free(_hidden_aes_128_cbc);
EVP_CIPHER_meth_free(_hidden_aes_256_ctr);
EVP_CIPHER_meth_free(_hidden_aes_128_cbc_hmac_sha1);
_hidden_aes_128_cbc = NULL;
_hidden_aes_256_ctr = NULL;
_hidden_aes_128_cbc_hmac_sha1 = NULL;
}

Expand All @@ -202,6 +218,7 @@ static int dasync_ciphers(ENGINE *e, const EVP_CIPHER **cipher,

static int dasync_cipher_nids[] = {
NID_aes_128_cbc,
NID_aes_256_ctr,
NID_aes_128_cbc_hmac_sha1,
0
};
Expand Down Expand Up @@ -284,6 +301,30 @@ static int bind_dasync(ENGINE *e)
_hidden_aes_128_cbc = NULL;
}

_hidden_aes_256_ctr = EVP_CIPHER_meth_new(NID_aes_256_ctr,
1 /* block size */,
32 /* key len */);
if (_hidden_aes_256_ctr == NULL
|| !EVP_CIPHER_meth_set_iv_length(_hidden_aes_256_ctr,16)
|| !EVP_CIPHER_meth_set_flags(_hidden_aes_256_ctr,
EVP_CIPH_FLAG_DEFAULT_ASN1
| EVP_CIPH_CTR_MODE
| EVP_CIPH_FLAG_PIPELINE
| EVP_CIPH_CUSTOM_COPY)
|| !EVP_CIPHER_meth_set_init(_hidden_aes_256_ctr,
dasync_aes256_init_key)
|| !EVP_CIPHER_meth_set_do_cipher(_hidden_aes_256_ctr,
dasync_aes256_ctr_cipher)
|| !EVP_CIPHER_meth_set_cleanup(_hidden_aes_256_ctr,
dasync_aes256_ctr_cleanup)
|| !EVP_CIPHER_meth_set_ctrl(_hidden_aes_256_ctr,
dasync_aes256_ctr_ctrl)
|| !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_aes_256_ctr,
sizeof(struct dasync_pipeline_ctx))) {
EVP_CIPHER_meth_free(_hidden_aes_256_ctr);
_hidden_aes_256_ctr = NULL;
}

_hidden_aes_128_cbc_hmac_sha1 = EVP_CIPHER_meth_new(
NID_aes_128_cbc_hmac_sha1,
16 /* block size */,
Expand Down Expand Up @@ -445,6 +486,9 @@ static int dasync_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
case NID_aes_128_cbc:
*cipher = dasync_aes_128_cbc();
break;
case NID_aes_256_ctr:
*cipher = dasync_aes_256_ctr();
break;
case NID_aes_128_cbc_hmac_sha1:
*cipher = dasync_aes_128_cbc_hmac_sha1();
break;
Expand Down Expand Up @@ -779,6 +823,29 @@ static int dasync_aes128_cbc_cleanup(EVP_CIPHER_CTX *ctx)
return dasync_cipher_cleanup_helper(ctx, EVP_aes_128_cbc());
}

static int dasync_aes256_ctr_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
void *ptr)
{
return dasync_cipher_ctrl_helper(ctx, type, arg, ptr, 0, EVP_aes_256_ctr());
}

static int dasync_aes256_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc)
{
return dasync_cipher_init_key_helper(ctx, key, iv, enc, EVP_aes_256_ctr());
}

static int dasync_aes256_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t inl)
{
return dasync_cipher_helper(ctx, out, in, inl, EVP_aes_256_ctr());
}

static int dasync_aes256_ctr_cleanup(EVP_CIPHER_CTX *ctx)
{
return dasync_cipher_cleanup_helper(ctx, EVP_aes_256_ctr());
}


/*
* AES128 CBC HMAC SHA1 Implementation
Expand Down
23 changes: 22 additions & 1 deletion test/recipes/05-test_rand.t
View file
Expand Up @@ -11,9 +11,30 @@ use warnings;
use OpenSSL::Test;
use OpenSSL::Test::Utils;

plan tests => 3;
plan tests => 5;
setup("test_rand");

ok(run(test(["rand_test"])));
ok(run(test(["drbgtest"])));
ok(run(test(["rand_status_test"])));

SKIP: {
skip "engine is not supported by this OpenSSL build", 2
if disabled("engine") || disabled("dynamic-engine");

my $success;
my @randdata;
my $expected = '0102030405060708090a0b0c0d0e0f10';

@randdata = run(app(['openssl', 'rand', '-engine', 'ossltest', '-hex', '16' ]),
capture => 1, statusvar => \$success);
chomp(@randdata);
ok($success and $randdata[0] eq $expected,
"rand with ossltest: Check rand output is as expected");

@randdata = run(app(['openssl', 'rand', '-engine', 'dasync', '-hex', '16' ]),
capture => 1, statusvar => \$success);
chomp(@randdata);
ok($success and length($randdata[0]) == 32,
"rand with dasync: Check rand output is of expected length");
}

0 comments on commit 872dd0a

Please sign in to comment.