Commit 5158c763 authored by Matt Caswell's avatar Matt Caswell
Browse files

Remove OPENSSL_NO_AES guards 



no-aes is no longer a Configure option and therefore the OPENSSL_NO_AES
guards can be removed.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 7ec8de16

apps/cms.c

+0 −9
Original line number Diff line number Diff line
@@ -214,11 +214,9 @@ OPTIONS cms_options[] = { 
    {"receipt_request_to", OPT_RR_TO, 's'},

    {"", OPT_CIPHER, '-', "Any supported cipher"},

    OPT_V_OPTIONS,

# ifndef OPENSSL_NO_AES

    {"aes128-wrap", OPT_AES128_WRAP, '-', "Use AES128 to wrap key"},

    {"aes192-wrap", OPT_AES192_WRAP, '-', "Use AES192 to wrap key"},

    {"aes256-wrap", OPT_AES256_WRAP, '-', "Use AES256 to wrap key"},

# endif

# ifndef OPENSSL_NO_DES

    {"des3-wrap", OPT_3DES_WRAP, '-', "Use 3DES-EDE to wrap key"},

# endif
@@ -603,7 +601,6 @@ int cms_main(int argc, char **argv) 
            wrap_cipher = EVP_des_ede3_wrap();

# endif

            break;

# ifndef OPENSSL_NO_AES

        case OPT_AES128_WRAP:

            wrap_cipher = EVP_aes_128_wrap();

            break;
@@ -613,12 +610,6 @@ int cms_main(int argc, char **argv) 
        case OPT_AES256_WRAP:

            wrap_cipher = EVP_aes_256_wrap();

            break;

# else

        case OPT_AES128_WRAP:

        case OPT_AES192_WRAP:

        case OPT_AES256_WRAP:

            break;

# endif

        }

    }

    argc = opt_num_rest();

apps/openssl.c

+0 −3
Original line number Diff line number Diff line
@@ -644,9 +644,6 @@ static int SortFnByName(const void *_f1, const void *_f2) 
static void list_disabled(void)

{

    BIO_puts(bio_out, "Disabled algorithms:\n");

#ifdef OPENSSL_NO_AES

    BIO_puts(bio_out, "AES\n");

#endif

#ifdef OPENSSL_NO_BF

    BIO_puts(bio_out, "BF\n");

#endif

apps/progs.h

+0 −12
Original line number Diff line number Diff line
@@ -248,24 +248,12 @@ static FUNCTION functions[] = { 
#ifndef OPENSSL_NO_BLAKE2

    { FT_md, "blake2s256", dgst_main},

#endif

#ifndef OPENSSL_NO_AES

    { FT_cipher, "aes-128-cbc", enc_main, enc_options },

#endif

#ifndef OPENSSL_NO_AES

    { FT_cipher, "aes-128-ecb", enc_main, enc_options },

#endif

#ifndef OPENSSL_NO_AES

    { FT_cipher, "aes-192-cbc", enc_main, enc_options },

#endif

#ifndef OPENSSL_NO_AES

    { FT_cipher, "aes-192-ecb", enc_main, enc_options },

#endif

#ifndef OPENSSL_NO_AES

    { FT_cipher, "aes-256-cbc", enc_main, enc_options },

#endif

#ifndef OPENSSL_NO_AES

    { FT_cipher, "aes-256-ecb", enc_main, enc_options },

#endif

#ifndef OPENSSL_NO_CAMELLIA

    { FT_cipher, "camellia-128-cbc", enc_main, enc_options },

#endif

apps/speed.c

+4 −25
Original line number Diff line number Diff line
@@ -99,9 +99,7 @@ 
#ifndef OPENSSL_NO_DES

# include <openssl/des.h>

#endif

#ifndef OPENSSL_NO_AES

#include <openssl/aes.h>

#endif

#ifndef OPENSSL_NO_CAMELLIA

# include <openssl/camellia.h>

#endif
@@ -249,7 +247,6 @@ static int RC4_loop(void *args); 
static int DES_ncbc_encrypt_loop(void *args);

static int DES_ede3_cbc_encrypt_loop(void *args);

#endif

#ifndef OPENSSL_NO_AES

static int AES_cbc_128_encrypt_loop(void *args);

static int AES_cbc_192_encrypt_loop(void *args);

static int AES_ige_128_encrypt_loop(void *args);
@@ -257,7 +254,6 @@ static int AES_cbc_256_encrypt_loop(void *args); 
static int AES_ige_192_encrypt_loop(void *args);

static int AES_ige_256_encrypt_loop(void *args);

static int CRYPTO_gcm128_aad_loop(void *args);

#endif

static int EVP_Update_loop(void *args);

static int EVP_Digest_loop(void *args);

#ifndef OPENSSL_NO_RSA
@@ -508,14 +504,12 @@ static OPT_PAIR doit_choices[] = { 
    {"des-cbc", D_CBC_DES},

    {"des-ede3", D_EDE3_DES},

#endif

#ifndef OPENSSL_NO_AES

    {"aes-128-cbc", D_CBC_128_AES},

    {"aes-192-cbc", D_CBC_192_AES},

    {"aes-256-cbc", D_CBC_256_AES},

    {"aes-128-ige", D_IGE_128_AES},

    {"aes-192-ige", D_IGE_192_AES},

    {"aes-256-ige", D_IGE_256_AES},

#endif

#ifndef OPENSSL_NO_RC2

    {"rc2-cbc", D_CBC_RC2},

    {"rc2", D_CBC_RC2},
@@ -819,14 +813,9 @@ static int DES_ede3_cbc_encrypt_loop(void *args) 
}

#endif



#ifndef OPENSSL_NO_AES

#define MAX_BLOCK_SIZE 128

#else

# define MAX_BLOCK_SIZE 64

#endif



static unsigned char iv[2 * MAX_BLOCK_SIZE / 8];

#ifndef OPENSSL_NO_AES

static AES_KEY aes_ks1, aes_ks2, aes_ks3;

static int AES_cbc_128_encrypt_loop(void *args)

{
@@ -914,8 +903,6 @@ static int CRYPTO_gcm128_aad_loop(void *args) 
    return count;

}



#endif



static int decrypt = 0;

static int EVP_Update_loop(void *args)

{
@@ -1294,7 +1281,6 @@ int speed_main(int argc, char **argv) 
        0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,

        0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12

    };

#ifndef OPENSSL_NO_AES

    static const unsigned char key24[24] = {

        0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,

        0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,
@@ -1306,7 +1292,6 @@ int speed_main(int argc, char **argv) 
        0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34,

        0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34, 0x56

    };

#endif

#ifndef OPENSSL_NO_CAMELLIA

    static const unsigned char ckey24[24] = {

        0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
@@ -1542,13 +1527,11 @@ int speed_main(int argc, char **argv) 
            continue;

        }

#endif

#ifndef OPENSSL_NO_AES

        if (strcmp(*argv, "aes") == 0) {

            doit[D_CBC_128_AES] = doit[D_CBC_192_AES] =

                doit[D_CBC_256_AES] = 1;

            continue;

        }

#endif

#ifndef OPENSSL_NO_CAMELLIA

        if (strcmp(*argv, "camellia") == 0) {

            doit[D_CBC_128_CML] = doit[D_CBC_192_CML] =
@@ -1675,11 +1658,9 @@ int speed_main(int argc, char **argv) 
    DES_set_key_unchecked(&key2, &sch2);

    DES_set_key_unchecked(&key3, &sch3);

#endif

#ifndef OPENSSL_NO_AES

    AES_set_encrypt_key(key16, 128, &aes_ks1);

    AES_set_encrypt_key(key24, 192, &aes_ks2);

    AES_set_encrypt_key(key32, 256, &aes_ks3);

#endif

#ifndef OPENSSL_NO_CAMELLIA

    Camellia_set_key(key16, 128, &camellia_ks1);

    Camellia_set_key(ckey24, 192, &camellia_ks2);
@@ -2079,7 +2060,7 @@ int speed_main(int argc, char **argv) 
        }

    }

#endif

#ifndef OPENSSL_NO_AES



    if (doit[D_CBC_128_AES]) {

        for (testnum = 0; testnum < SIZE_NUM; testnum++) {

            print_message(names[D_CBC_128_AES], c[D_CBC_128_AES][testnum],
@@ -2157,7 +2138,7 @@ int speed_main(int argc, char **argv) 
        for (i = 0; i < loopargs_len; i++)

            CRYPTO_gcm128_release(loopargs[i].gcm_ctx);

    }

#endif



#ifndef OPENSSL_NO_CAMELLIA

    if (doit[D_CBC_128_CML]) {

        for (testnum = 0; testnum < SIZE_NUM; testnum++) {
@@ -2710,9 +2691,7 @@ int speed_main(int argc, char **argv) 
#ifndef OPENSSL_NO_DES

        printf("%s ", DES_options());

#endif

#ifndef OPENSSL_NO_AES

        printf("%s ", AES_options());

#endif

#ifndef OPENSSL_NO_IDEA

        printf("%s ", idea_options());

#endif

crypto/evp/c_allc.c

+6 −8
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ void openssl_add_all_ciphers_int(void) 
    EVP_add_cipher_alias(SN_rc5_cbc, "RC5");

#endif



#ifndef OPENSSL_NO_AES

    EVP_add_cipher(EVP_aes_128_ecb());

    EVP_add_cipher(EVP_aes_128_cbc());

    EVP_add_cipher(EVP_aes_128_cfb());
@@ -225,7 +224,6 @@ void openssl_add_all_ciphers_int(void) 
    EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1());

    EVP_add_cipher(EVP_aes_128_cbc_hmac_sha256());

    EVP_add_cipher(EVP_aes_256_cbc_hmac_sha256());

#endif



#ifndef OPENSSL_NO_CAMELLIA

    EVP_add_cipher(EVP_camellia_128_ecb());