diff options
-rw-r--r-- | src/regress/lib/libcrypto/bf/bf_test.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/regress/lib/libcrypto/bf/bf_test.c b/src/regress/lib/libcrypto/bf/bf_test.c index c31bd865ba..153444e9d7 100644 --- a/src/regress/lib/libcrypto/bf/bf_test.c +++ b/src/regress/lib/libcrypto/bf/bf_test.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bf_test.c,v 1.1 2022/11/06 14:56:08 joshua Exp $ */ | 1 | /* $OpenBSD: bf_test.c,v 1.2 2022/11/07 23:04:25 joshua Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2022 Joshua Sing <joshua@hypera.dev> | 3 | * Copyright (c) 2022 Joshua Sing <joshua@hypera.dev> |
4 | * | 4 | * |
@@ -981,14 +981,14 @@ static const struct bf_test bf_tests[] = { | |||
981 | static int | 981 | static int |
982 | bf_ecb_test(size_t test_number, const struct bf_test *bt) | 982 | bf_ecb_test(size_t test_number, const struct bf_test *bt) |
983 | { | 983 | { |
984 | BF_KEY key; | ||
985 | uint8_t out[8]; | ||
986 | |||
984 | if (bt->padding) { | 987 | if (bt->padding) { |
985 | /* XXX - Handle padding */ | 988 | /* XXX - Handle padding */ |
986 | return 1; | 989 | return 1; |
987 | } | 990 | } |
988 | 991 | ||
989 | BF_KEY key; | ||
990 | uint8_t out[8]; | ||
991 | |||
992 | /* Encryption */ | 992 | /* Encryption */ |
993 | memset(out, 0, sizeof(out)); | 993 | memset(out, 0, sizeof(out)); |
994 | BF_set_key(&key, bt->key_len, bt->key); | 994 | BF_set_key(&key, bt->key_len, bt->key); |
@@ -1017,15 +1017,15 @@ bf_ecb_test(size_t test_number, const struct bf_test *bt) | |||
1017 | static int | 1017 | static int |
1018 | bf_cbc_test(size_t test_number, const struct bf_test *bt) | 1018 | bf_cbc_test(size_t test_number, const struct bf_test *bt) |
1019 | { | 1019 | { |
1020 | BF_KEY key; | ||
1021 | uint8_t out[512]; | ||
1022 | uint8_t iv[64]; | ||
1023 | |||
1020 | if (bt->padding) { | 1024 | if (bt->padding) { |
1021 | /* XXX - Handle padding */ | 1025 | /* XXX - Handle padding */ |
1022 | return 1; | 1026 | return 1; |
1023 | } | 1027 | } |
1024 | 1028 | ||
1025 | BF_KEY key; | ||
1026 | uint8_t out[512]; | ||
1027 | uint8_t iv[64]; | ||
1028 | |||
1029 | /* Encryption */ | 1029 | /* Encryption */ |
1030 | memset(out, 0, sizeof(out)); | 1030 | memset(out, 0, sizeof(out)); |
1031 | memcpy(iv, bt->iv, bt->iv_len); | 1031 | memcpy(iv, bt->iv, bt->iv_len); |
@@ -1056,16 +1056,16 @@ bf_cbc_test(size_t test_number, const struct bf_test *bt) | |||
1056 | static int | 1056 | static int |
1057 | bf_cfb64_test(size_t test_number, const struct bf_test *bt) | 1057 | bf_cfb64_test(size_t test_number, const struct bf_test *bt) |
1058 | { | 1058 | { |
1059 | if (bt->padding) { | ||
1060 | /* XXX - Handle padding */ | ||
1061 | return 1; | ||
1062 | } | ||
1063 | |||
1064 | BF_KEY key; | 1059 | BF_KEY key; |
1065 | uint8_t out[512]; | 1060 | uint8_t out[512]; |
1066 | uint8_t iv[64]; | 1061 | uint8_t iv[64]; |
1067 | int remainder = 0; | 1062 | int remainder = 0; |
1068 | 1063 | ||
1064 | if (bt->padding) { | ||
1065 | /* XXX - Handle padding */ | ||
1066 | return 1; | ||
1067 | } | ||
1068 | |||
1069 | /* Encryption */ | 1069 | /* Encryption */ |
1070 | memset(out, 0, sizeof(out)); | 1070 | memset(out, 0, sizeof(out)); |
1071 | memcpy(iv, bt->iv, bt->iv_len); | 1071 | memcpy(iv, bt->iv, bt->iv_len); |
@@ -1097,16 +1097,16 @@ bf_cfb64_test(size_t test_number, const struct bf_test *bt) | |||
1097 | static int | 1097 | static int |
1098 | bf_ofb64_test(size_t test_number, const struct bf_test *bt) | 1098 | bf_ofb64_test(size_t test_number, const struct bf_test *bt) |
1099 | { | 1099 | { |
1100 | if (bt->padding) { | ||
1101 | /* XXX - Handle padding */ | ||
1102 | return 1; | ||
1103 | } | ||
1104 | |||
1105 | BF_KEY key; | 1100 | BF_KEY key; |
1106 | uint8_t out[512]; | 1101 | uint8_t out[512]; |
1107 | uint8_t iv[64]; | 1102 | uint8_t iv[64]; |
1108 | int remainder = 0; | 1103 | int remainder = 0; |
1109 | 1104 | ||
1105 | if (bt->padding) { | ||
1106 | /* XXX - Handle padding */ | ||
1107 | return 1; | ||
1108 | } | ||
1109 | |||
1110 | /* Encryption */ | 1110 | /* Encryption */ |
1111 | memset(out, 0, sizeof(out)); | 1111 | memset(out, 0, sizeof(out)); |
1112 | memcpy(iv, bt->iv, bt->iv_len); | 1112 | memcpy(iv, bt->iv, bt->iv_len); |