diff options
| author | nectar <nectar@FreeBSD.org> | 2004-03-17 17:44:39 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2004-03-17 17:44:39 +0000 |
| commit | 2283471bb53a546e9d7dfb662c8db5ca06907c85 (patch) | |
| tree | 2f72c65a69a9678c0d95fcb2a67a3e7b1c592424 /crypto/openssl/apps/speed.c | |
| parent | c7c23f8cb0c95f4e18f44ca080df2d2ecb97eb3c (diff) | |
| download | FreeBSD-src-2283471bb53a546e9d7dfb662c8db5ca06907c85.zip FreeBSD-src-2283471bb53a546e9d7dfb662c8db5ca06907c85.tar.gz | |
Resolve conflicts after import of OpenSSL 0.9.7d.
Diffstat (limited to 'crypto/openssl/apps/speed.c')
| -rw-r--r-- | crypto/openssl/apps/speed.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/openssl/apps/speed.c b/crypto/openssl/apps/speed.c index ec55b41..2412200 100644 --- a/crypto/openssl/apps/speed.c +++ b/crypto/openssl/apps/speed.c @@ -773,6 +773,7 @@ int MAIN(int argc, char **argv) { dsa_doit[R_DSA_512]=1; dsa_doit[R_DSA_1024]=1; + dsa_doit[R_DSA_2048]=1; } else #endif @@ -1006,6 +1007,9 @@ int MAIN(int argc, char **argv) c[D_CBC_RC5][0]=count; c[D_CBC_BF][0]=count; c[D_CBC_CAST][0]=count; + c[D_CBC_128_AES][0]=count; + c[D_CBC_192_AES][0]=count; + c[D_CBC_256_AES][0]=count; for (i=1; i<SIZE_NUM; i++) { @@ -1031,6 +1035,9 @@ int MAIN(int argc, char **argv) c[D_CBC_RC5][i]=c[D_CBC_RC5][i-1]*l0/l1; c[D_CBC_BF][i]=c[D_CBC_BF][i-1]*l0/l1; c[D_CBC_CAST][i]=c[D_CBC_CAST][i-1]*l0/l1; + c[D_CBC_128_AES][i]=c[D_CBC_128_AES][i-1]*l0/l1; + c[D_CBC_192_AES][i]=c[D_CBC_192_AES][i-1]*l0/l1; + c[D_CBC_256_AES][i]=c[D_CBC_256_AES][i-1]*l0/l1; } #ifndef OPENSSL_NO_RSA rsa_c[R_RSA_512][0]=count/2000; |
