#endif
#undef BUFSIZE
-#define BUFSIZE ((long)1024*8+64)
+#define BUFSIZE ((long)1024*8+1)
int run=0;
static int mr=0;
static int do_multi(int multi);
#endif
-#define ALGOR_NUM 33
+#define ALGOR_NUM 30
#define SIZE_NUM 5
#define RSA_NUM 4
#define DSA_NUM 3
"aes-128 cbc","aes-192 cbc","aes-256 cbc",
"camellia-128 cbc","camellia-192 cbc","camellia-256 cbc",
"evp","sha256","sha512","whirlpool",
- "aes-128 ige","aes-192 ige","aes-256 ige","ghash",
- "aes-128 gcm", "aes-256 gcm", "chacha20 poly1305",
-};
+ "aes-128 ige","aes-192 ige","aes-256 ige","ghash" };
static double results[ALGOR_NUM][SIZE_NUM];
static int lengths[SIZE_NUM]={16,64,256,1024,8*1024};
#ifndef OPENSSL_NO_RSA
}
#endif /* OPENSSL_NO_ECDH */
+static void multiblock_speed(const EVP_CIPHER *evp_cipher);
int MAIN(int, char **);
#define D_IGE_192_AES 27
#define D_IGE_256_AES 28
#define D_GHASH 29
-#define D_AES_128_GCM 30
-#define D_AES_256_GCM 31
-#define D_CHACHA20_POLY1305 32
double d=0.0;
long c[ALGOR_NUM][SIZE_NUM];
#define R_DSA_512 0
#ifndef NO_FORK
int multi=0;
#endif
+ int multiblock=0;
#ifndef TIMES
usertime=-1;
j--; /* Otherwise, -mr gets confused with
an algorithm. */
}
+ else if (argc > 0 && !strcmp(*argv,"-mb"))
+ {
+ multiblock=1;
+ j--;
+ }
else
#ifndef OPENSSL_NO_MD2
if (strcmp(*argv,"md2") == 0) doit[D_MD2]=1;
{
doit[D_GHASH]=1;
}
- else if (strcmp(*argv,"aes-128-gcm") == 0)
- {
- doit[D_AES_128_GCM]=1;
- }
- else if (strcmp(*argv,"aes-256-gcm") == 0)
- {
- doit[D_AES_256_GCM]=1;
- }
else
#endif
#ifndef OPENSSL_NO_CAMELLIA
}
else
#endif
-#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
- if (strcmp(*argv,"chacha20-poly1305") == 0)
- {
- doit[D_CHACHA20_POLY1305]=1;
- }
- else
-#endif
#ifndef OPENSSL_NO_RSA
if (strcmp(*argv,"rsa") == 0)
{
#endif
#ifndef OPENSSL_NO_AES
BIO_printf(bio_err,"aes-128-cbc aes-192-cbc aes-256-cbc ");
- BIO_printf(bio_err,"aes-128-ige aes-192-ige aes-256-ige\n");
- BIO_printf(bio_err,"aes-128-gcm aes-256-gcm ");
+ BIO_printf(bio_err,"aes-128-ige aes-192-ige aes-256-ige ");
#endif
#ifndef OPENSSL_NO_CAMELLIA
BIO_printf(bio_err,"\n");
#endif
#ifndef OPENSSL_NO_RC4
BIO_printf(bio_err,"rc4");
-#endif
-#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
- BIO_printf(bio_err," chacha20-poly1305");
#endif
BIO_printf(bio_err,"\n");
c[D_IGE_192_AES][0]=count;
c[D_IGE_256_AES][0]=count;
c[D_GHASH][0]=count;
- c[D_AES_128_GCM][0]=count;
- c[D_CHACHA20_POLY1305][0]=count;
for (i=1; i<SIZE_NUM; i++)
{
CRYPTO_gcm128_release(ctx);
}
- if (doit[D_AES_128_GCM])
- {
- const EVP_AEAD *aead = EVP_aead_aes_128_gcm();
- static const unsigned char nonce[32] = {0};
- size_t nonce_len;
- EVP_AEAD_CTX ctx;
-
- EVP_AEAD_CTX_init(&ctx, aead, key32, EVP_AEAD_key_length(aead),
- EVP_AEAD_DEFAULT_TAG_LENGTH, NULL);
- nonce_len = EVP_AEAD_nonce_length(aead);
-
- for (j=0; j<SIZE_NUM; j++)
- {
- print_message(names[D_AES_128_GCM], c[D_AES_128_GCM][j],
- lengths[j]);
- Time_F(START);
- for (count=0,run=1; COND(c[D_AES_128_GCM][j]); count++)
- EVP_AEAD_CTX_seal(&ctx, buf, BUFSIZE, nonce,
- nonce_len, buf, lengths[j],
- NULL, 0);
- d=Time_F(STOP);
- print_result(D_AES_128_GCM,j,count,d);
- }
- EVP_AEAD_CTX_cleanup(&ctx);
- }
-
- if (doit[D_AES_256_GCM])
- {
- const EVP_AEAD *aead = EVP_aead_aes_256_gcm();
- static const unsigned char nonce[32] = {0};
- size_t nonce_len;
- EVP_AEAD_CTX ctx;
-
- EVP_AEAD_CTX_init(&ctx, aead, key32, EVP_AEAD_key_length(aead),
- EVP_AEAD_DEFAULT_TAG_LENGTH, NULL);
- nonce_len = EVP_AEAD_nonce_length(aead);
-
- for (j=0; j<SIZE_NUM; j++)
- {
- print_message(names[D_AES_256_GCM], c[D_AES_256_GCM][j],
- lengths[j]);
- Time_F(START);
- for (count=0,run=1; COND(c[D_AES_256_GCM][j]); count++)
- EVP_AEAD_CTX_seal(&ctx, buf, BUFSIZE, nonce,
- nonce_len, buf, lengths[j],
- NULL, 0);
- d=Time_F(STOP);
- print_result(D_AES_256_GCM,j,count,d);
- }
- EVP_AEAD_CTX_cleanup(&ctx);
- }
-#endif
-
-#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
- if (doit[D_CHACHA20_POLY1305])
- {
- const EVP_AEAD *aead = EVP_aead_chacha20_poly1305();
- static const unsigned char nonce[32] = {0};
- size_t nonce_len;
- EVP_AEAD_CTX ctx;
-
- EVP_AEAD_CTX_init(&ctx, aead, key32, EVP_AEAD_key_length(aead),
- EVP_AEAD_DEFAULT_TAG_LENGTH, NULL);
- nonce_len = EVP_AEAD_nonce_length(aead);
-
- for (j=0; j<SIZE_NUM; j++)
- {
- print_message(names[D_CHACHA20_POLY1305],
- c[D_CHACHA20_POLY1305][j], lengths[j]);
- Time_F(START);
- for (count=0,run=1; COND(c[D_CHACHA20_POLY1305][j]);
- count++)
- EVP_AEAD_CTX_seal(&ctx, buf, BUFSIZE, nonce,
- nonce_len, buf, lengths[j],
- NULL, 0);
- d=Time_F(STOP);
- print_result(D_CHACHA20_POLY1305,j,count,d);
- }
- EVP_AEAD_CTX_cleanup(&ctx);
- }
#endif
-
#ifndef OPENSSL_NO_CAMELLIA
if (doit[D_CBC_128_CML])
{
if (doit[D_EVP])
{
+#ifdef EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK
+ if (multiblock && evp_cipher)
+ {
+ if (!(EVP_CIPHER_flags(evp_cipher)&EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK))
+ {
+ fprintf(stderr,"%s is not multi-block capable\n",OBJ_nid2ln(evp_cipher->nid));
+ goto end;
+ }
+ multiblock_speed(evp_cipher);
+ mret=0;
+ goto end;
+ }
+#endif
for (j=0; j<SIZE_NUM; j++)
{
if (evp_cipher)
return 1;
}
#endif
+
+static void multiblock_speed(const EVP_CIPHER *evp_cipher)
+ {
+ static int mblengths[]={8*1024,2*8*1024,4*8*1024,8*8*1024,8*16*1024};
+ int j,count,num=sizeof(lengths)/sizeof(lengths[0]);
+ const char *alg_name;
+ unsigned char *inp,*out,no_key[32],no_iv[16];
+ EVP_CIPHER_CTX ctx;
+ double d=0.0;
+
+ inp = OPENSSL_malloc(mblengths[num-1]);
+ out = OPENSSL_malloc(mblengths[num-1]+1024);
+
+ EVP_CIPHER_CTX_init(&ctx);
+ 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);
+
+ for (j=0; j<num; j++)
+ {
+ print_message(alg_name,0,mblengths[j]);
+ Time_F(START);
+ for (count=0,run=1; run && count<0x7fffffff; count++)
+ {
+ unsigned char aad[13];
+ EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM mb_param;
+ size_t len = mblengths[j];
+ int packlen;
+
+ memset(aad,0,8);/* avoid uninitialized values */
+ aad[8] = 23; /* SSL3_RT_APPLICATION_DATA */
+ aad[9] = 3; /* version */
+ aad[10] = 2;
+ aad[11] = 0; /* length */
+ aad[12] = 0;
+ mb_param.out = NULL;
+ mb_param.inp = aad;
+ mb_param.len = len;
+ mb_param.interleave = 8;
+
+ packlen=EVP_CIPHER_CTX_ctrl(&ctx,
+ EVP_CTRL_TLS1_1_MULTIBLOCK_AAD,
+ sizeof(mb_param),&mb_param);
+
+ if (packlen>0)
+ {
+ mb_param.out = out;
+ mb_param.inp = inp;
+ mb_param.len = len;
+ EVP_CIPHER_CTX_ctrl(&ctx,
+ EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT,
+ sizeof(mb_param),&mb_param);
+ }
+ else
+ {
+ int pad;
+
+ RAND_bytes(out,16);
+ len+=16;
+ aad[11] = len>>8;
+ aad[12] = len;
+ pad=EVP_CIPHER_CTX_ctrl(&ctx,
+ EVP_CTRL_AEAD_TLS1_AAD,13,aad);
+ EVP_Cipher(&ctx,out,inp,len+pad);
+ }
+ }
+ d=Time_F(STOP);
+ BIO_printf(bio_err,mr ? "+R:%d:%s:%f\n"
+ : "%d %s's in %.2fs\n",count,"evp",d);
+ results[D_EVP][j]=((double)count)/d*mblengths[j];
+ }
+
+ if (mr)
+ {
+ fprintf(stdout,"+H");
+ for (j=0; j<num; j++)
+ fprintf(stdout,":%d",mblengths[j]);
+ fprintf(stdout,"\n");
+ fprintf(stdout,"+F:%d:%s",D_EVP,alg_name);
+ for (j=0; j<num; j++)
+ fprintf(stdout,":%.2f",results[D_EVP][j]);
+ fprintf(stdout,"\n");
+ }
+ else
+ {
+ fprintf(stdout,"The 'numbers' are in 1000s of bytes per second processed.\n");
+ fprintf(stdout,"type ");
+ for (j=0; j<num; j++)
+ fprintf(stdout,"%7d bytes",mblengths[j]);
+ fprintf(stdout,"\n");
+ fprintf(stdout,"%-24s",alg_name);
+
+ for (j=0; j<num; j++)
+ {
+ if (results[D_EVP][j] > 10000)
+ fprintf(stdout," %11.2fk",results[D_EVP][j]/1e3);
+ else
+ fprintf(stdout," %11.2f ",results[D_EVP][j]);
+ }
+ fprintf(stdout,"\n");
+ }
+
+ OPENSSL_free(inp);
+ OPENSSL_free(out);
+ }
#endif