diff options
Diffstat (limited to '')
| -rw-r--r-- | src/regress/lib/libcrypto/x509/x509_asn1.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/regress/lib/libcrypto/x509/x509_asn1.c b/src/regress/lib/libcrypto/x509/x509_asn1.c index c45221240b..5dead2ac00 100644 --- a/src/regress/lib/libcrypto/x509/x509_asn1.c +++ b/src/regress/lib/libcrypto/x509/x509_asn1.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_asn1.c,v 1.3 2023/04/26 10:55:58 job Exp $ */ | 1 | /* $OpenBSD: x509_asn1.c,v 1.4 2023/04/26 11:00:49 job Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2023 Job Snijders <job@openbsd.org> | 3 | * Copyright (c) 2023 Job Snijders <job@openbsd.org> |
| 4 | * | 4 | * |
| @@ -31,7 +31,7 @@ | |||
| 31 | 31 | ||
| 32 | static void | 32 | static void |
| 33 | x509_setup(unsigned char **der, unsigned char **der2, X509 **x, | 33 | x509_setup(unsigned char **der, unsigned char **der2, X509 **x, |
| 34 | const unsigned char **cpder2, long dersz, long *der2sz) | 34 | long dersz, long *der2sz) |
| 35 | { | 35 | { |
| 36 | const unsigned char *cpder; | 36 | const unsigned char *cpder; |
| 37 | 37 | ||
| @@ -40,7 +40,6 @@ x509_setup(unsigned char **der, unsigned char **der2, X509 **x, | |||
| 40 | errx(1, "d2i_X509"); | 40 | errx(1, "d2i_X509"); |
| 41 | if ((*der2sz = i2d_X509(*x, der2)) <= 0) | 41 | if ((*der2sz = i2d_X509(*x, der2)) <= 0) |
| 42 | errx(1, "i2d_X509"); | 42 | errx(1, "i2d_X509"); |
| 43 | *cpder2 = *der2; | ||
| 44 | } | 43 | } |
| 45 | 44 | ||
| 46 | static void | 45 | static void |
| @@ -127,7 +126,6 @@ main(void) | |||
| 127 | EVP_PKEY *pkey = NULL; | 126 | EVP_PKEY *pkey = NULL; |
| 128 | EVP_PKEY_CTX *pkey_ctx = NULL; | 127 | EVP_PKEY_CTX *pkey_ctx = NULL; |
| 129 | X509 *a, *x; | 128 | X509 *a, *x; |
| 130 | const unsigned char *cpder2; | ||
| 131 | unsigned char *der = NULL, *der2 = NULL; | 129 | unsigned char *der = NULL, *der2 = NULL; |
| 132 | long dersz, der2sz; | 130 | long dersz, der2sz; |
| 133 | int ret = 0; | 131 | int ret = 0; |
| @@ -159,51 +157,51 @@ main(void) | |||
| 159 | errx(1, "i2d_X509"); | 157 | errx(1, "i2d_X509"); |
| 160 | 158 | ||
| 161 | /* test X509_set_version */ | 159 | /* test X509_set_version */ |
| 162 | x509_setup(&der, &der2, &a, &cpder2, dersz, &der2sz); | 160 | x509_setup(&der, &der2, &a, dersz, &der2sz); |
| 163 | if (!X509_set_version(a, 2)) | 161 | if (!X509_set_version(a, 2)) |
| 164 | errx(1, "X509_set_version"); | 162 | errx(1, "X509_set_version"); |
| 165 | ret += x509_compare("X509_set_version", a, cpder2, der2sz); | 163 | ret += x509_compare("X509_set_version", a, der2, der2sz); |
| 166 | x509_cleanup(&a, &der2); | 164 | x509_cleanup(&a, &der2); |
| 167 | 165 | ||
| 168 | /* test X509_set_serialNumber */ | 166 | /* test X509_set_serialNumber */ |
| 169 | x509_setup(&der, &der2, &a, &cpder2, dersz, &der2sz); | 167 | x509_setup(&der, &der2, &a, dersz, &der2sz); |
| 170 | x509_set_integer(X509_set_serialNumber, &a, 2); | 168 | x509_set_integer(X509_set_serialNumber, &a, 2); |
| 171 | ret += x509_compare("X509_set_serialNumber", a, cpder2, der2sz); | 169 | ret += x509_compare("X509_set_serialNumber", a, der2, der2sz); |
| 172 | x509_cleanup(&a, &der2); | 170 | x509_cleanup(&a, &der2); |
| 173 | 171 | ||
| 174 | /* test X509_set_issuer_name */ | 172 | /* test X509_set_issuer_name */ |
| 175 | x509_setup(&der, &der2, &a, &cpder2, dersz, &der2sz); | 173 | x509_setup(&der, &der2, &a, dersz, &der2sz); |
| 176 | x509_set_name(X509_set_issuer_name, &a, "DE"); | 174 | x509_set_name(X509_set_issuer_name, &a, "DE"); |
| 177 | ret += x509_compare("X509_set_issuer_name", a, cpder2, der2sz); | 175 | ret += x509_compare("X509_set_issuer_name", a, der2, der2sz); |
| 178 | x509_cleanup(&a, &der2); | 176 | x509_cleanup(&a, &der2); |
| 179 | 177 | ||
| 180 | /* test X509_set_subject_name */ | 178 | /* test X509_set_subject_name */ |
| 181 | x509_setup(&der, &der2, &a, &cpder2, dersz, &der2sz); | 179 | x509_setup(&der, &der2, &a, dersz, &der2sz); |
| 182 | x509_set_name(X509_set_subject_name, &a, "FR"); | 180 | x509_set_name(X509_set_subject_name, &a, "FR"); |
| 183 | ret += x509_compare("X509_set_subject_name", a, cpder2, der2sz); | 181 | ret += x509_compare("X509_set_subject_name", a, der2, der2sz); |
| 184 | x509_cleanup(&a, &der2); | 182 | x509_cleanup(&a, &der2); |
| 185 | 183 | ||
| 186 | /* test X509_set_notBefore */ | 184 | /* test X509_set_notBefore */ |
| 187 | x509_setup(&der, &der2, &a, &cpder2, dersz, &der2sz); | 185 | x509_setup(&der, &der2, &a, dersz, &der2sz); |
| 188 | x509_set_time(X509_set_notBefore, &a, 120); | 186 | x509_set_time(X509_set_notBefore, &a, 120); |
| 189 | ret += x509_compare("X509_set_notBefore", a, cpder2, der2sz); | 187 | ret += x509_compare("X509_set_notBefore", a, der2, der2sz); |
| 190 | x509_cleanup(&a, &der2); | 188 | x509_cleanup(&a, &der2); |
| 191 | 189 | ||
| 192 | /* test X509_set_notAfter */ | 190 | /* test X509_set_notAfter */ |
| 193 | x509_setup(&der, &der2, &a, &cpder2, dersz, &der2sz); | 191 | x509_setup(&der, &der2, &a, dersz, &der2sz); |
| 194 | x509_set_time(X509_set_notAfter, &a, 180); | 192 | x509_set_time(X509_set_notAfter, &a, 180); |
| 195 | ret += x509_compare("X509_set_notAfter", a, cpder2, der2sz); | 193 | ret += x509_compare("X509_set_notAfter", a, der2, der2sz); |
| 196 | x509_cleanup(&a, &der2); | 194 | x509_cleanup(&a, &der2); |
| 197 | 195 | ||
| 198 | /* test X509_set_pubkey */ | 196 | /* test X509_set_pubkey */ |
| 199 | x509_setup(&der, &der2, &a, &cpder2, dersz, &der2sz); | 197 | x509_setup(&der, &der2, &a, dersz, &der2sz); |
| 200 | if (EVP_PKEY_keygen(pkey_ctx, &pkey) <= 0) | 198 | if (EVP_PKEY_keygen(pkey_ctx, &pkey) <= 0) |
| 201 | errx(1, "EVP_PKEY_keygen"); | 199 | errx(1, "EVP_PKEY_keygen"); |
| 202 | if (X509_set_pubkey(a, pkey) != 1) | 200 | if (X509_set_pubkey(a, pkey) != 1) |
| 203 | errx(1, "X509_set_pubkey"); | 201 | errx(1, "X509_set_pubkey"); |
| 204 | EVP_PKEY_CTX_free(pkey_ctx); | 202 | EVP_PKEY_CTX_free(pkey_ctx); |
| 205 | EVP_PKEY_free(pkey); | 203 | EVP_PKEY_free(pkey); |
| 206 | ret += x509_compare("X509_set_pubkey", a, cpder2, der2sz); | 204 | ret += x509_compare("X509_set_pubkey", a, der2, der2sz); |
| 207 | x509_cleanup(&a, &der2); | 205 | x509_cleanup(&a, &der2); |
| 208 | 206 | ||
| 209 | if (ret) | 207 | if (ret) |
