diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/openssl/speed.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/usr.bin/openssl/speed.c b/src/usr.bin/openssl/speed.c index 0254c03062..3be0cc2ab1 100644 --- a/src/usr.bin/openssl/speed.c +++ b/src/usr.bin/openssl/speed.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: speed.c,v 1.43 2025/05/24 08:04:21 joshua Exp $ */ | 1 | /* $OpenBSD: speed.c,v 1.44 2025/05/24 09:25:38 joshua Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -911,12 +911,6 @@ static const unsigned char key32[] = { | |||
| 911 | 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34, 0x56, | 911 | 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34, 0x56, |
| 912 | }; | 912 | }; |
| 913 | 913 | ||
| 914 | #ifndef OPENSSL_NO_AES | ||
| 915 | #define MAX_BLOCK_SIZE 128 | ||
| 916 | #else | ||
| 917 | #define MAX_BLOCK_SIZE 64 | ||
| 918 | #endif | ||
| 919 | |||
| 920 | static void | 914 | static void |
| 921 | sig_done(int sig) | 915 | sig_done(int sig) |
| 922 | { | 916 | { |
| @@ -981,7 +975,7 @@ speed_main(int argc, char **argv) | |||
| 981 | CAST_KEY cast_ks; | 975 | CAST_KEY cast_ks; |
| 982 | #endif | 976 | #endif |
| 983 | unsigned char DES_iv[8]; | 977 | unsigned char DES_iv[8]; |
| 984 | unsigned char iv[2 * MAX_BLOCK_SIZE / 8]; | 978 | unsigned char iv[2 * 16]; |
| 985 | #ifndef OPENSSL_NO_DES | 979 | #ifndef OPENSSL_NO_DES |
| 986 | static DES_cblock key = {0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0}; | 980 | static DES_cblock key = {0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0}; |
| 987 | static DES_cblock key2 = {0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12}; | 981 | static DES_cblock key2 = {0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12}; |
