diff options
| author | job <> | 2023-04-26 10:55:58 +0000 |
|---|---|---|
| committer | job <> | 2023-04-26 10:55:58 +0000 |
| commit | 9603b00eb842a84c0903893011a2016f521c201b (patch) | |
| tree | 3a0a446b10d44bcd94be941b7d6e63f23f25988b | |
| parent | 0244787a95ee33807a1b5185a149b252f38d9eb4 (diff) | |
| download | openbsd-9603b00eb842a84c0903893011a2016f521c201b.tar.gz openbsd-9603b00eb842a84c0903893011a2016f521c201b.tar.bz2 openbsd-9603b00eb842a84c0903893011a2016f521c201b.zip | |
Shrink signature as cpder is only needed as local variable
Suggested by tb@
Diffstat (limited to '')
| -rw-r--r-- | src/regress/lib/libcrypto/x509/x509_asn1.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/regress/lib/libcrypto/x509/x509_asn1.c b/src/regress/lib/libcrypto/x509/x509_asn1.c index 93d617a7c7..c45221240b 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.2 2023/04/26 10:34:08 job Exp $ */ | 1 | /* $OpenBSD: x509_asn1.c,v 1.3 2023/04/26 10:55:58 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,11 +31,12 @@ | |||
| 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 **cpder, const unsigned char **cpder2, long dersz, | 34 | const unsigned char **cpder2, long dersz, long *der2sz) |
| 35 | long *der2sz) | ||
| 36 | { | 35 | { |
| 37 | *cpder = *der; | 36 | const unsigned char *cpder; |
| 38 | if ((*x = d2i_X509(NULL, cpder, dersz)) == NULL) | 37 | |
| 38 | cpder = *der; | ||
| 39 | if ((*x = d2i_X509(NULL, &cpder, dersz)) == NULL) | ||
| 39 | errx(1, "d2i_X509"); | 40 | errx(1, "d2i_X509"); |
| 40 | if ((*der2sz = i2d_X509(*x, der2)) <= 0) | 41 | if ((*der2sz = i2d_X509(*x, der2)) <= 0) |
| 41 | errx(1, "i2d_X509"); | 42 | errx(1, "i2d_X509"); |
| @@ -126,11 +127,11 @@ main(void) | |||
| 126 | EVP_PKEY *pkey = NULL; | 127 | EVP_PKEY *pkey = NULL; |
| 127 | EVP_PKEY_CTX *pkey_ctx = NULL; | 128 | EVP_PKEY_CTX *pkey_ctx = NULL; |
| 128 | X509 *a, *x; | 129 | X509 *a, *x; |
| 129 | const unsigned char *cpder, *cpder2; | 130 | const unsigned char *cpder2; |
| 130 | unsigned char *der = NULL, *der2 = NULL; | 131 | unsigned char *der = NULL, *der2 = NULL; |
| 131 | long dersz, der2sz; | 132 | long dersz, der2sz; |
| 132 | int ret = 0; | 133 | int ret = 0; |
| 133 | 134 | ||
| 134 | if ((x = X509_new()) == NULL) | 135 | if ((x = X509_new()) == NULL) |
| 135 | err(1, NULL); | 136 | err(1, NULL); |
| 136 | 137 | ||
| @@ -158,44 +159,44 @@ main(void) | |||
| 158 | errx(1, "i2d_X509"); | 159 | errx(1, "i2d_X509"); |
| 159 | 160 | ||
| 160 | /* test X509_set_version */ | 161 | /* test X509_set_version */ |
| 161 | x509_setup(&der, &der2, &a, &cpder, &cpder2, dersz, &der2sz); | 162 | x509_setup(&der, &der2, &a, &cpder2, dersz, &der2sz); |
| 162 | if (!X509_set_version(a, 2)) | 163 | if (!X509_set_version(a, 2)) |
| 163 | errx(1, "X509_set_version"); | 164 | errx(1, "X509_set_version"); |
| 164 | ret += x509_compare("X509_set_version", a, cpder2, der2sz); | 165 | ret += x509_compare("X509_set_version", a, cpder2, der2sz); |
| 165 | x509_cleanup(&a, &der2); | 166 | x509_cleanup(&a, &der2); |
| 166 | 167 | ||
| 167 | /* test X509_set_serialNumber */ | 168 | /* test X509_set_serialNumber */ |
| 168 | x509_setup(&der, &der2, &a, &cpder, &cpder2, dersz, &der2sz); | 169 | x509_setup(&der, &der2, &a, &cpder2, dersz, &der2sz); |
| 169 | x509_set_integer(X509_set_serialNumber, &a, 2); | 170 | x509_set_integer(X509_set_serialNumber, &a, 2); |
| 170 | ret += x509_compare("X509_set_serialNumber", a, cpder2, der2sz); | 171 | ret += x509_compare("X509_set_serialNumber", a, cpder2, der2sz); |
| 171 | x509_cleanup(&a, &der2); | 172 | x509_cleanup(&a, &der2); |
| 172 | 173 | ||
| 173 | /* test X509_set_issuer_name */ | 174 | /* test X509_set_issuer_name */ |
| 174 | x509_setup(&der, &der2, &a, &cpder, &cpder2, dersz, &der2sz); | 175 | x509_setup(&der, &der2, &a, &cpder2, dersz, &der2sz); |
| 175 | x509_set_name(X509_set_issuer_name, &a, "DE"); | 176 | x509_set_name(X509_set_issuer_name, &a, "DE"); |
| 176 | ret += x509_compare("X509_set_issuer_name", a, cpder2, der2sz); | 177 | ret += x509_compare("X509_set_issuer_name", a, cpder2, der2sz); |
| 177 | x509_cleanup(&a, &der2); | 178 | x509_cleanup(&a, &der2); |
| 178 | 179 | ||
| 179 | /* test X509_set_subject_name */ | 180 | /* test X509_set_subject_name */ |
| 180 | x509_setup(&der, &der2, &a, &cpder, &cpder2, dersz, &der2sz); | 181 | x509_setup(&der, &der2, &a, &cpder2, dersz, &der2sz); |
| 181 | x509_set_name(X509_set_subject_name, &a, "FR"); | 182 | x509_set_name(X509_set_subject_name, &a, "FR"); |
| 182 | ret += x509_compare("X509_set_subject_name", a, cpder2, der2sz); | 183 | ret += x509_compare("X509_set_subject_name", a, cpder2, der2sz); |
| 183 | x509_cleanup(&a, &der2); | 184 | x509_cleanup(&a, &der2); |
| 184 | 185 | ||
| 185 | /* test X509_set_notBefore */ | 186 | /* test X509_set_notBefore */ |
| 186 | x509_setup(&der, &der2, &a, &cpder, &cpder2, dersz, &der2sz); | 187 | x509_setup(&der, &der2, &a, &cpder2, dersz, &der2sz); |
| 187 | x509_set_time(X509_set_notBefore, &a, 120); | 188 | x509_set_time(X509_set_notBefore, &a, 120); |
| 188 | ret += x509_compare("X509_set_notBefore", a, cpder2, der2sz); | 189 | ret += x509_compare("X509_set_notBefore", a, cpder2, der2sz); |
| 189 | x509_cleanup(&a, &der2); | 190 | x509_cleanup(&a, &der2); |
| 190 | 191 | ||
| 191 | /* test X509_set_notAfter */ | 192 | /* test X509_set_notAfter */ |
| 192 | x509_setup(&der, &der2, &a, &cpder, &cpder2, dersz, &der2sz); | 193 | x509_setup(&der, &der2, &a, &cpder2, dersz, &der2sz); |
| 193 | x509_set_time(X509_set_notAfter, &a, 180); | 194 | x509_set_time(X509_set_notAfter, &a, 180); |
| 194 | ret += x509_compare("X509_set_notAfter", a, cpder2, der2sz); | 195 | ret += x509_compare("X509_set_notAfter", a, cpder2, der2sz); |
| 195 | x509_cleanup(&a, &der2); | 196 | x509_cleanup(&a, &der2); |
| 196 | 197 | ||
| 197 | /* test X509_set_pubkey */ | 198 | /* test X509_set_pubkey */ |
| 198 | x509_setup(&der, &der2, &a, &cpder, &cpder2, dersz, &der2sz); | 199 | x509_setup(&der, &der2, &a, &cpder2, dersz, &der2sz); |
| 199 | if (EVP_PKEY_keygen(pkey_ctx, &pkey) <= 0) | 200 | if (EVP_PKEY_keygen(pkey_ctx, &pkey) <= 0) |
| 200 | errx(1, "EVP_PKEY_keygen"); | 201 | errx(1, "EVP_PKEY_keygen"); |
| 201 | if (X509_set_pubkey(a, pkey) != 1) | 202 | if (X509_set_pubkey(a, pkey) != 1) |
