diff options
| author | Matt Caswell <matt@openssl.org> | 2016-11-01 18:28:19 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-11-02 13:28:21 +0000 |
| commit | ca0b75ade0e89d1d3782ed6b1a4ae0fab72251ec (patch) | |
| tree | ddd7e657ff690bf2adb2eb3aeac25bf97b4959d9 /engines/e_ossltest.c | |
| parent | 837e591d42ae499c89930a7277005c5034a12b04 (diff) | |
| download | openssl-new-ca0b75ade0e89d1d3782ed6b1a4ae0fab72251ec.tar.gz | |
Fix some style issues in ossltest
Based on feedback received
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'engines/e_ossltest.c')
| -rw-r--r-- | engines/e_ossltest.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/engines/e_ossltest.c b/engines/e_ossltest.c index 6b006a4440..afa5edfeec 100644 --- a/engines/e_ossltest.c +++ b/engines/e_ossltest.c @@ -265,11 +265,13 @@ static const EVP_CIPHER *ossltest_aes_128_cbc(void) return _hidden_aes_128_cbc; } static EVP_CIPHER *_hidden_aes_128_gcm = NULL; + #define AES_GCM_FLAGS (EVP_CIPH_FLAG_DEFAULT_ASN1 \ | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \ | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \ | EVP_CIPH_CUSTOM_COPY |EVP_CIPH_FLAG_AEAD_CIPHER \ | EVP_CIPH_GCM_MODE) + static const EVP_CIPHER *ossltest_aes_128_gcm(void) { if (_hidden_aes_128_gcm == NULL @@ -615,11 +617,10 @@ int ossltest_aes128_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, int ossltest_aes128_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) { - unsigned char *tmpbuf; const size_t datalen = inl - EVP_GCM_TLS_EXPLICIT_IV_LEN - EVP_GCM_TLS_TAG_LEN; + unsigned char *tmpbuf = OPENSSL_malloc(datalen); - tmpbuf = OPENSSL_malloc(datalen); if (tmpbuf == NULL) return -1; @@ -643,10 +644,6 @@ int ossltest_aes128_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, static int ossltest_aes128_gcm_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) { - int ret; - /* Pass the ctrl down */ - ret = EVP_CIPHER_meth_get_ctrl(EVP_aes_128_gcm())(ctx, type, arg, ptr); - - return ret; + return EVP_CIPHER_meth_get_ctrl(EVP_aes_128_gcm())(ctx, type, arg, ptr); } |