diff options
| author | tb <> | 2024-07-12 08:46:45 +0000 |
|---|---|---|
| committer | tb <> | 2024-07-12 08:46:45 +0000 |
| commit | a2c60e8511e787112fbdd3538d024eaea0443f83 (patch) | |
| tree | 55b0acea9af00b79bcbc951aadf4240593456bb8 /src | |
| parent | 917a1e7030406b9350a24748b055d9f6f373dc56 (diff) | |
| download | openbsd-a2c60e8511e787112fbdd3538d024eaea0443f83.tar.gz openbsd-a2c60e8511e787112fbdd3538d024eaea0443f83.tar.bz2 openbsd-a2c60e8511e787112fbdd3538d024eaea0443f83.zip | |
Simplify X509v3_get_ext() and X509v3_delete_ext()
Drop unnecessary checks that are part of the stack API.
ok jsing
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_v3.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/lib/libcrypto/x509/x509_v3.c b/src/lib/libcrypto/x509/x509_v3.c index 5e8257ff83..cca74e734a 100644 --- a/src/lib/libcrypto/x509/x509_v3.c +++ b/src/lib/libcrypto/x509/x509_v3.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_v3.c,v 1.32 2024/07/12 08:44:16 tb Exp $ */ | 1 | /* $OpenBSD: x509_v3.c,v 1.33 2024/07/12 08:46:45 tb 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 | * |
| @@ -131,9 +131,6 @@ LCRYPTO_ALIAS(X509v3_get_ext_by_critical); | |||
| 131 | X509_EXTENSION * | 131 | X509_EXTENSION * |
| 132 | X509v3_get_ext(const STACK_OF(X509_EXTENSION) *sk, int loc) | 132 | X509v3_get_ext(const STACK_OF(X509_EXTENSION) *sk, int loc) |
| 133 | { | 133 | { |
| 134 | if (sk == NULL || sk_X509_EXTENSION_num(sk) <= loc || loc < 0) | ||
| 135 | return NULL; | ||
| 136 | |||
| 137 | return sk_X509_EXTENSION_value(sk, loc); | 134 | return sk_X509_EXTENSION_value(sk, loc); |
| 138 | } | 135 | } |
| 139 | LCRYPTO_ALIAS(X509v3_get_ext); | 136 | LCRYPTO_ALIAS(X509v3_get_ext); |
| @@ -141,9 +138,6 @@ LCRYPTO_ALIAS(X509v3_get_ext); | |||
| 141 | X509_EXTENSION * | 138 | X509_EXTENSION * |
| 142 | X509v3_delete_ext(STACK_OF(X509_EXTENSION) *sk, int loc) | 139 | X509v3_delete_ext(STACK_OF(X509_EXTENSION) *sk, int loc) |
| 143 | { | 140 | { |
| 144 | if (sk == NULL || sk_X509_EXTENSION_num(sk) <= loc || loc < 0) | ||
| 145 | return NULL; | ||
| 146 | |||
| 147 | return sk_X509_EXTENSION_delete(sk, loc); | 141 | return sk_X509_EXTENSION_delete(sk, loc); |
| 148 | } | 142 | } |
| 149 | LCRYPTO_ALIAS(X509v3_delete_ext); | 143 | LCRYPTO_ALIAS(X509v3_delete_ext); |