diff options
| author | Matt Caswell <matt@openssl.org> | 2018-02-07 15:20:31 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-02-07 22:34:18 +0100 |
| commit | 04e3bb045f9b407d1ec681cfbeab4da8e53d750a (patch) | |
| tree | f68179224faf4e769ea9c04b84d4326279d5c9b9 /engines | |
| parent | Fix clienthellotest with TLSv1.3 (diff) | |
| download | openssl-04e3bb045f9b407d1ec681cfbeab4da8e53d750a.tar.xz openssl-04e3bb045f9b407d1ec681cfbeab4da8e53d750a.zip | |
Fix some undefined behaviour in ossltest engine
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5266)
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/e_ossltest.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/engines/e_ossltest.c b/engines/e_ossltest.c index d3d6998e99..8fc056abfc 100644 --- a/engines/e_ossltest.c +++ b/engines/e_ossltest.c @@ -593,17 +593,21 @@ int ossltest_aes128_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, int ret; tmpbuf = OPENSSL_malloc(inl); - if (tmpbuf == NULL) + + /* OPENSSL_malloc will return NULL if inl == 0 */ + if (tmpbuf == NULL && inl > 0) return -1; /* Remember what we were asked to encrypt */ - memcpy(tmpbuf, in, inl); + if (tmpbuf != NULL) + memcpy(tmpbuf, in, inl); /* Go through the motions of encrypting it */ ret = EVP_CIPHER_meth_get_do_cipher(EVP_aes_128_cbc())(ctx, out, in, inl); /* Throw it all away and just use the plaintext as the output */ - memcpy(out, tmpbuf, inl); + if (tmpbuf != NULL) + memcpy(out, tmpbuf, inl); OPENSSL_free(tmpbuf); return ret; @@ -626,13 +630,15 @@ int ossltest_aes128_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, return -1; /* Remember what we were asked to encrypt */ - memcpy(tmpbuf, in, inl); + if (tmpbuf != NULL) + memcpy(tmpbuf, in, inl); /* Go through the motions of encrypting it */ EVP_CIPHER_meth_get_do_cipher(EVP_aes_128_gcm())(ctx, out, in, inl); /* Throw it all away and just use the plaintext as the output */ - memcpy(out, tmpbuf, inl); + if (tmpbuf != NULL) + memcpy(out, tmpbuf, inl); OPENSSL_free(tmpbuf); return inl; |