diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/regress/lib/libcrypto/evp/evp_test.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/regress/lib/libcrypto/evp/evp_test.c b/src/regress/lib/libcrypto/evp/evp_test.c index 09036aff94..ec6a9435ff 100644 --- a/src/regress/lib/libcrypto/evp/evp_test.c +++ b/src/regress/lib/libcrypto/evp/evp_test.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: evp_test.c,v 1.12 2023/12/30 08:58:18 tb Exp $ */ | 1 | /* $OpenBSD: evp_test.c,v 1.13 2023/12/31 01:31:07 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2022 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2022 Joel Sing <jsing@openbsd.org> |
| 4 | * Copyright (c) 2023 Theo Buehler <tb@openbsd.org> | 4 | * Copyright (c) 2023 Theo Buehler <tb@openbsd.org> |
| @@ -169,46 +169,55 @@ evp_asn1_method_aliases_test(void) | |||
| 169 | fprintf(stderr, "FAIL: non-alias with " | 169 | fprintf(stderr, "FAIL: non-alias with " |
| 170 | "id %d != base_id %d\n", id, base_id); | 170 | "id %d != base_id %d\n", id, base_id); |
| 171 | failed |= 1; | 171 | failed |= 1; |
| 172 | continue; | ||
| 172 | } | 173 | } |
| 173 | if (info == NULL || strlen(info) == 0) { | 174 | if (info == NULL || strlen(info) == 0) { |
| 174 | fprintf(stderr, "FAIL: missing or empty info %d\n", id); | 175 | fprintf(stderr, "FAIL: missing or empty info %d\n", id); |
| 175 | failed |= 1; | 176 | failed |= 1; |
| 177 | continue; | ||
| 176 | } | 178 | } |
| 177 | if (pem_str == NULL) { | 179 | if (pem_str == NULL) { |
| 178 | fprintf(stderr, "FAIL: missing pem_str %d\n", id); | 180 | fprintf(stderr, "FAIL: missing pem_str %d\n", id); |
| 179 | failed |= 1; | 181 | failed |= 1; |
| 182 | continue; | ||
| 180 | } | 183 | } |
| 181 | if ((pem_str_len = strlen(pem_str)) == 0) { | 184 | if ((pem_str_len = strlen(pem_str)) == 0) { |
| 182 | fprintf(stderr, "FAIL: empty pem_str %d\n", id); | 185 | fprintf(stderr, "FAIL: empty pem_str %d\n", id); |
| 183 | failed |= 1; | 186 | failed |= 1; |
| 187 | continue; | ||
| 184 | } | 188 | } |
| 185 | 189 | ||
| 186 | if (evp_pkey_asn1_find(id, i) != NULL) { | 190 | if (evp_pkey_asn1_find(id, i) != NULL) { |
| 187 | fprintf(stderr, "FAIL: duplicate ameth %d\n", id); | 191 | fprintf(stderr, "FAIL: duplicate ameth %d\n", id); |
| 188 | failed |= 1; | 192 | failed |= 1; |
| 193 | continue; | ||
| 189 | } | 194 | } |
| 190 | 195 | ||
| 191 | if (ameth != EVP_PKEY_asn1_find(NULL, id)) { | 196 | if (ameth != EVP_PKEY_asn1_find(NULL, id)) { |
| 192 | fprintf(stderr, "FAIL: EVP_PKEY_asn1_find(%d) " | 197 | fprintf(stderr, "FAIL: EVP_PKEY_asn1_find(%d) " |
| 193 | "returned different ameth\n", id); | 198 | "returned different ameth\n", id); |
| 194 | failed |= 1; | 199 | failed |= 1; |
| 200 | continue; | ||
| 195 | } | 201 | } |
| 196 | if (ameth != EVP_PKEY_asn1_find_str(NULL, pem_str, -1)) { | 202 | if (ameth != EVP_PKEY_asn1_find_str(NULL, pem_str, -1)) { |
| 197 | fprintf(stderr, "FAIL: EVP_PKEY_asn1_find_str(%s) " | 203 | fprintf(stderr, "FAIL: EVP_PKEY_asn1_find_str(%s) " |
| 198 | "returned different ameth\n", pem_str); | 204 | "returned different ameth\n", pem_str); |
| 199 | failed |= 1; | 205 | failed |= 1; |
| 206 | continue; | ||
| 200 | } | 207 | } |
| 201 | if (ameth != EVP_PKEY_asn1_find_str(NULL, | 208 | if (ameth != EVP_PKEY_asn1_find_str(NULL, |
| 202 | pem_str, pem_str_len)) { | 209 | pem_str, pem_str_len)) { |
| 203 | fprintf(stderr, "FAIL: EVP_PKEY_asn1_find_str(%s, %zu) " | 210 | fprintf(stderr, "FAIL: EVP_PKEY_asn1_find_str(%s, %zu) " |
| 204 | "returned different ameth\n", pem_str, pem_str_len); | 211 | "returned different ameth\n", pem_str, pem_str_len); |
| 205 | failed |= 1; | 212 | failed |= 1; |
| 213 | continue; | ||
| 206 | } | 214 | } |
| 207 | if (EVP_PKEY_asn1_find_str(NULL, pem_str, | 215 | if (EVP_PKEY_asn1_find_str(NULL, pem_str, |
| 208 | pem_str_len - 1) != NULL) { | 216 | pem_str_len - 1) != NULL) { |
| 209 | fprintf(stderr, "FAIL: EVP_PKEY_asn1_find_str(%s, %zu) " | 217 | fprintf(stderr, "FAIL: EVP_PKEY_asn1_find_str(%s, %zu) " |
| 210 | "returned an ameth\n", pem_str, pem_str_len - 1); | 218 | "returned an ameth\n", pem_str, pem_str_len - 1); |
| 211 | failed |= 1; | 219 | failed |= 1; |
| 220 | continue; | ||
| 212 | } | 221 | } |
| 213 | continue; | 222 | continue; |
| 214 | } | 223 | } |
