[BACK]Return to speed.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / openssl

Diff for /src/usr.bin/openssl/speed.c between version 1.15 and 1.16

version 1.15, 2015/09/14 01:45:03 version 1.16, 2015/09/20 13:39:13
Line 164 
Line 164 
 static void print_result(int alg, int run_no, int count, double time_used);  static void print_result(int alg, int run_no, int count, double time_used);
 static int do_multi(int multi);  static int do_multi(int multi);
   
 #define ALGOR_NUM       33  #define ALGOR_NUM       32
 #define SIZE_NUM        5  #define SIZE_NUM        5
 #define RSA_NUM         4  #define RSA_NUM         4
 #define DSA_NUM         3  #define DSA_NUM         3
Line 173 
Line 173 
 #define MAX_ECDH_SIZE 256  #define MAX_ECDH_SIZE 256
   
 static const char *names[ALGOR_NUM] = {  static const char *names[ALGOR_NUM] = {
         "md2", NULL /* was mdc2 */, "md4", "md5", "hmac(md5)", "sha1", "rmd160",          "md2", "md4", "md5", "hmac(md5)", "sha1", "rmd160",
         "rc4", "des cbc", "des ede3", "idea cbc", "seed cbc",          "rc4", "des cbc", "des ede3", "idea cbc", "seed cbc",
         "rc2 cbc", "rc5-32/12 cbc", "blowfish cbc", "cast cbc",          "rc2 cbc", "rc5-32/12 cbc", "blowfish cbc", "cast cbc",
         "aes-128 cbc", "aes-192 cbc", "aes-256 cbc",          "aes-128 cbc", "aes-192 cbc", "aes-256 cbc",
Line 318 
Line 318 
         CAMELLIA_KEY camellia_ks1, camellia_ks2, camellia_ks3;          CAMELLIA_KEY camellia_ks1, camellia_ks2, camellia_ks3;
 #endif  #endif
 #define D_MD2           0  #define D_MD2           0
 #define D_MD4           2  #define D_MD4           1
 #define D_MD5           3  #define D_MD5           2
 #define D_HMAC          4  #define D_HMAC          3
 #define D_SHA1          5  #define D_SHA1          4
 #define D_RMD160        6  #define D_RMD160        5
 #define D_RC4           7  #define D_RC4           6
 #define D_CBC_DES       8  #define D_CBC_DES       7
 #define D_EDE3_DES      9  #define D_EDE3_DES      8
 #define D_CBC_IDEA      10  #define D_CBC_IDEA      9
 #define D_CBC_SEED      11  #define D_CBC_SEED      10
 #define D_CBC_RC2       12  #define D_CBC_RC2       11
 #define D_CBC_RC5       13  #define D_CBC_RC5       12
 #define D_CBC_BF        14  #define D_CBC_BF        13
 #define D_CBC_CAST      15  #define D_CBC_CAST      14
 #define D_CBC_128_AES   16  #define D_CBC_128_AES   15
 #define D_CBC_192_AES   17  #define D_CBC_192_AES   16
 #define D_CBC_256_AES   18  #define D_CBC_256_AES   17
 #define D_CBC_128_CML   19  #define D_CBC_128_CML   18
 #define D_CBC_192_CML   20  #define D_CBC_192_CML   19
 #define D_CBC_256_CML   21  #define D_CBC_256_CML   20
 #define D_EVP           22  #define D_EVP           21
 #define D_SHA256        23  #define D_SHA256        22
 #define D_SHA512        24  #define D_SHA512        23
 #define D_WHIRLPOOL     25  #define D_WHIRLPOOL     24
 #define D_IGE_128_AES   26  #define D_IGE_128_AES   25
 #define D_IGE_192_AES   27  #define D_IGE_192_AES   26
 #define D_IGE_256_AES   28  #define D_IGE_256_AES   27
 #define D_GHASH         29  #define D_GHASH         28
 #define D_AES_128_GCM   30  #define D_AES_128_GCM   29
 #define D_AES_256_GCM   31  #define D_AES_256_GCM   30
 #define D_CHACHA20_POLY1305     32  #define D_CHACHA20_POLY1305     31
         double d = 0.0;          double d = 0.0;
         long c[ALGOR_NUM][SIZE_NUM];          long c[ALGOR_NUM][SIZE_NUM];
 #define R_DSA_512       0  #define R_DSA_512       0

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16