diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-12-18 17:08:49 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-01-12 13:52:22 +0100 |
| commit | 6c2ff56ec606ed82cf02b9a6679b90bde6ce18aa (patch) | |
| tree | 501390f334b7e216d606af1c8a5b727d7cd97b0c /apps | |
| parent | 3dcb9e4e0fb8d6ee373c44013141452e79da30cc (diff) | |
| download | openssl-6c2ff56ec606ed82cf02b9a6679b90bde6ce18aa.tar.gz | |
Adapt all EVP_CIPHER users for it becoming opaque
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/enc.c | 8 | ||||
| -rw-r--r-- | apps/speed.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/enc.c b/apps/enc.c index 17cc8e8742..ab91369ee7 100644 --- a/apps/enc.c +++ b/apps/enc.c @@ -528,15 +528,15 @@ int enc_main(int argc, char **argv) printf("%02X", salt[i]); printf("\n"); } - if (cipher->key_len > 0) { + if (EVP_CIPHER_key_length(cipher) > 0) { printf("key="); - for (i = 0; i < cipher->key_len; i++) + for (i = 0; i < EVP_CIPHER_key_length(cipher); i++) printf("%02X", key[i]); printf("\n"); } - if (cipher->iv_len > 0) { + if (EVP_CIPHER_iv_length(cipher) > 0) { printf("iv ="); - for (i = 0; i < cipher->iv_len; i++) + for (i = 0; i < EVP_CIPHER_iv_length(cipher); i++) printf("%02X", iv[i]); printf("\n"); } diff --git a/apps/speed.c b/apps/speed.c index a8f227fd5f..d45a6f9beb 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -1644,7 +1644,7 @@ int speed_main(int argc, char **argv) (EVP_CIPHER_flags(evp_cipher) & EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) { BIO_printf(bio_err, "%s is not multi-block capable\n", - OBJ_nid2ln(evp_cipher->nid)); + OBJ_nid2ln(EVP_CIPHER_nid(evp_cipher))); goto end; } multiblock_speed(evp_cipher); @@ -1657,7 +1657,7 @@ int speed_main(int argc, char **argv) EVP_CIPHER_CTX *ctx; int outl; - names[D_EVP] = OBJ_nid2ln(evp_cipher->nid); + names[D_EVP] = OBJ_nid2ln(EVP_CIPHER_nid(evp_cipher)); /* * -O3 -fschedule-insns messes up an optimization here! * names[D_EVP] somehow becomes NULL @@ -2447,7 +2447,7 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher) EVP_EncryptInit_ex(ctx, evp_cipher, NULL, no_key, no_iv); EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_MAC_KEY, sizeof(no_key), no_key); - alg_name = OBJ_nid2ln(evp_cipher->nid); + alg_name = OBJ_nid2ln(EVP_CIPHER_nid(evp_cipher)); for (j = 0; j < num; j++) { print_message(alg_name, 0, mblengths[j]); |