diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509_cmp.c')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_cmp.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/lib/libcrypto/x509/x509_cmp.c b/src/lib/libcrypto/x509/x509_cmp.c index b76c9ea660..3ee4fd4a5d 100644 --- a/src/lib/libcrypto/x509/x509_cmp.c +++ b/src/lib/libcrypto/x509/x509_cmp.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_cmp.c,v 1.41 2022/11/26 16:08:54 tb Exp $ */ | 1 | /* $OpenBSD: x509_cmp.c,v 1.42 2023/02/16 08:38:17 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 | * |
| @@ -84,7 +84,7 @@ X509_issuer_and_serial_cmp(const X509 *a, const X509 *b) | |||
| 84 | return (i); | 84 | return (i); |
| 85 | return (X509_NAME_cmp(ai->issuer, bi->issuer)); | 85 | return (X509_NAME_cmp(ai->issuer, bi->issuer)); |
| 86 | } | 86 | } |
| 87 | LCRYPTO_ALIAS(X509_issuer_and_serial_cmp) | 87 | LCRYPTO_ALIAS(X509_issuer_and_serial_cmp); |
| 88 | 88 | ||
| 89 | #ifndef OPENSSL_NO_MD5 | 89 | #ifndef OPENSSL_NO_MD5 |
| 90 | unsigned long | 90 | unsigned long |
| @@ -120,7 +120,7 @@ err: | |||
| 120 | free(f); | 120 | free(f); |
| 121 | return (ret); | 121 | return (ret); |
| 122 | } | 122 | } |
| 123 | LCRYPTO_ALIAS(X509_issuer_and_serial_hash) | 123 | LCRYPTO_ALIAS(X509_issuer_and_serial_hash); |
| 124 | #endif | 124 | #endif |
| 125 | 125 | ||
| 126 | int | 126 | int |
| @@ -128,21 +128,21 @@ X509_issuer_name_cmp(const X509 *a, const X509 *b) | |||
| 128 | { | 128 | { |
| 129 | return (X509_NAME_cmp(a->cert_info->issuer, b->cert_info->issuer)); | 129 | return (X509_NAME_cmp(a->cert_info->issuer, b->cert_info->issuer)); |
| 130 | } | 130 | } |
| 131 | LCRYPTO_ALIAS(X509_issuer_name_cmp) | 131 | LCRYPTO_ALIAS(X509_issuer_name_cmp); |
| 132 | 132 | ||
| 133 | int | 133 | int |
| 134 | X509_subject_name_cmp(const X509 *a, const X509 *b) | 134 | X509_subject_name_cmp(const X509 *a, const X509 *b) |
| 135 | { | 135 | { |
| 136 | return (X509_NAME_cmp(a->cert_info->subject, b->cert_info->subject)); | 136 | return (X509_NAME_cmp(a->cert_info->subject, b->cert_info->subject)); |
| 137 | } | 137 | } |
| 138 | LCRYPTO_ALIAS(X509_subject_name_cmp) | 138 | LCRYPTO_ALIAS(X509_subject_name_cmp); |
| 139 | 139 | ||
| 140 | int | 140 | int |
| 141 | X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b) | 141 | X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b) |
| 142 | { | 142 | { |
| 143 | return (X509_NAME_cmp(a->crl->issuer, b->crl->issuer)); | 143 | return (X509_NAME_cmp(a->crl->issuer, b->crl->issuer)); |
| 144 | } | 144 | } |
| 145 | LCRYPTO_ALIAS(X509_CRL_cmp) | 145 | LCRYPTO_ALIAS(X509_CRL_cmp); |
| 146 | 146 | ||
| 147 | #ifndef OPENSSL_NO_SHA | 147 | #ifndef OPENSSL_NO_SHA |
| 148 | int | 148 | int |
| @@ -150,7 +150,7 @@ X509_CRL_match(const X509_CRL *a, const X509_CRL *b) | |||
| 150 | { | 150 | { |
| 151 | return memcmp(a->hash, b->hash, X509_CRL_HASH_LEN); | 151 | return memcmp(a->hash, b->hash, X509_CRL_HASH_LEN); |
| 152 | } | 152 | } |
| 153 | LCRYPTO_ALIAS(X509_CRL_match) | 153 | LCRYPTO_ALIAS(X509_CRL_match); |
| 154 | #endif | 154 | #endif |
| 155 | 155 | ||
| 156 | X509_NAME * | 156 | X509_NAME * |
| @@ -158,14 +158,14 @@ X509_get_issuer_name(const X509 *a) | |||
| 158 | { | 158 | { |
| 159 | return (a->cert_info->issuer); | 159 | return (a->cert_info->issuer); |
| 160 | } | 160 | } |
| 161 | LCRYPTO_ALIAS(X509_get_issuer_name) | 161 | LCRYPTO_ALIAS(X509_get_issuer_name); |
| 162 | 162 | ||
| 163 | unsigned long | 163 | unsigned long |
| 164 | X509_issuer_name_hash(X509 *x) | 164 | X509_issuer_name_hash(X509 *x) |
| 165 | { | 165 | { |
| 166 | return (X509_NAME_hash(x->cert_info->issuer)); | 166 | return (X509_NAME_hash(x->cert_info->issuer)); |
| 167 | } | 167 | } |
| 168 | LCRYPTO_ALIAS(X509_issuer_name_hash) | 168 | LCRYPTO_ALIAS(X509_issuer_name_hash); |
| 169 | 169 | ||
| 170 | #ifndef OPENSSL_NO_MD5 | 170 | #ifndef OPENSSL_NO_MD5 |
| 171 | unsigned long | 171 | unsigned long |
| @@ -173,7 +173,7 @@ X509_issuer_name_hash_old(X509 *x) | |||
| 173 | { | 173 | { |
| 174 | return (X509_NAME_hash_old(x->cert_info->issuer)); | 174 | return (X509_NAME_hash_old(x->cert_info->issuer)); |
| 175 | } | 175 | } |
| 176 | LCRYPTO_ALIAS(X509_issuer_name_hash_old) | 176 | LCRYPTO_ALIAS(X509_issuer_name_hash_old); |
| 177 | #endif | 177 | #endif |
| 178 | 178 | ||
| 179 | X509_NAME * | 179 | X509_NAME * |
| @@ -181,28 +181,28 @@ X509_get_subject_name(const X509 *a) | |||
| 181 | { | 181 | { |
| 182 | return (a->cert_info->subject); | 182 | return (a->cert_info->subject); |
| 183 | } | 183 | } |
| 184 | LCRYPTO_ALIAS(X509_get_subject_name) | 184 | LCRYPTO_ALIAS(X509_get_subject_name); |
| 185 | 185 | ||
| 186 | ASN1_INTEGER * | 186 | ASN1_INTEGER * |
| 187 | X509_get_serialNumber(X509 *a) | 187 | X509_get_serialNumber(X509 *a) |
| 188 | { | 188 | { |
| 189 | return (a->cert_info->serialNumber); | 189 | return (a->cert_info->serialNumber); |
| 190 | } | 190 | } |
| 191 | LCRYPTO_ALIAS(X509_get_serialNumber) | 191 | LCRYPTO_ALIAS(X509_get_serialNumber); |
| 192 | 192 | ||
| 193 | const ASN1_INTEGER * | 193 | const ASN1_INTEGER * |
| 194 | X509_get0_serialNumber(const X509 *a) | 194 | X509_get0_serialNumber(const X509 *a) |
| 195 | { | 195 | { |
| 196 | return (a->cert_info->serialNumber); | 196 | return (a->cert_info->serialNumber); |
| 197 | } | 197 | } |
| 198 | LCRYPTO_ALIAS(X509_get0_serialNumber) | 198 | LCRYPTO_ALIAS(X509_get0_serialNumber); |
| 199 | 199 | ||
| 200 | unsigned long | 200 | unsigned long |
| 201 | X509_subject_name_hash(X509 *x) | 201 | X509_subject_name_hash(X509 *x) |
| 202 | { | 202 | { |
| 203 | return (X509_NAME_hash(x->cert_info->subject)); | 203 | return (X509_NAME_hash(x->cert_info->subject)); |
| 204 | } | 204 | } |
| 205 | LCRYPTO_ALIAS(X509_subject_name_hash) | 205 | LCRYPTO_ALIAS(X509_subject_name_hash); |
| 206 | 206 | ||
| 207 | #ifndef OPENSSL_NO_MD5 | 207 | #ifndef OPENSSL_NO_MD5 |
| 208 | unsigned long | 208 | unsigned long |
| @@ -210,7 +210,7 @@ X509_subject_name_hash_old(X509 *x) | |||
| 210 | { | 210 | { |
| 211 | return (X509_NAME_hash_old(x->cert_info->subject)); | 211 | return (X509_NAME_hash_old(x->cert_info->subject)); |
| 212 | } | 212 | } |
| 213 | LCRYPTO_ALIAS(X509_subject_name_hash_old) | 213 | LCRYPTO_ALIAS(X509_subject_name_hash_old); |
| 214 | #endif | 214 | #endif |
| 215 | 215 | ||
| 216 | #ifndef OPENSSL_NO_SHA | 216 | #ifndef OPENSSL_NO_SHA |
| @@ -232,7 +232,7 @@ X509_cmp(const X509 *a, const X509 *b) | |||
| 232 | 232 | ||
| 233 | return memcmp(a->hash, b->hash, X509_CERT_HASH_LEN); | 233 | return memcmp(a->hash, b->hash, X509_CERT_HASH_LEN); |
| 234 | } | 234 | } |
| 235 | LCRYPTO_ALIAS(X509_cmp) | 235 | LCRYPTO_ALIAS(X509_cmp); |
| 236 | #endif | 236 | #endif |
| 237 | 237 | ||
| 238 | int | 238 | int |
| @@ -256,7 +256,7 @@ X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b) | |||
| 256 | return ret; | 256 | return ret; |
| 257 | return memcmp(a->canon_enc, b->canon_enc, a->canon_enclen); | 257 | return memcmp(a->canon_enc, b->canon_enc, a->canon_enclen); |
| 258 | } | 258 | } |
| 259 | LCRYPTO_ALIAS(X509_NAME_cmp) | 259 | LCRYPTO_ALIAS(X509_NAME_cmp); |
| 260 | 260 | ||
| 261 | unsigned long | 261 | unsigned long |
| 262 | X509_NAME_hash(X509_NAME *x) | 262 | X509_NAME_hash(X509_NAME *x) |
| @@ -275,7 +275,7 @@ X509_NAME_hash(X509_NAME *x) | |||
| 275 | 0xffffffffL; | 275 | 0xffffffffL; |
| 276 | return (ret); | 276 | return (ret); |
| 277 | } | 277 | } |
| 278 | LCRYPTO_ALIAS(X509_NAME_hash) | 278 | LCRYPTO_ALIAS(X509_NAME_hash); |
| 279 | 279 | ||
| 280 | 280 | ||
| 281 | #ifndef OPENSSL_NO_MD5 | 281 | #ifndef OPENSSL_NO_MD5 |
| @@ -304,7 +304,7 @@ X509_NAME_hash_old(X509_NAME *x) | |||
| 304 | 304 | ||
| 305 | return (ret); | 305 | return (ret); |
| 306 | } | 306 | } |
| 307 | LCRYPTO_ALIAS(X509_NAME_hash_old) | 307 | LCRYPTO_ALIAS(X509_NAME_hash_old); |
| 308 | #endif | 308 | #endif |
| 309 | 309 | ||
| 310 | /* Search a stack of X509 for a match */ | 310 | /* Search a stack of X509 for a match */ |
| @@ -330,7 +330,7 @@ X509_find_by_issuer_and_serial(STACK_OF(X509) *sk, X509_NAME *name, | |||
| 330 | } | 330 | } |
| 331 | return (NULL); | 331 | return (NULL); |
| 332 | } | 332 | } |
| 333 | LCRYPTO_ALIAS(X509_find_by_issuer_and_serial) | 333 | LCRYPTO_ALIAS(X509_find_by_issuer_and_serial); |
| 334 | 334 | ||
| 335 | X509 * | 335 | X509 * |
| 336 | X509_find_by_subject(STACK_OF(X509) *sk, X509_NAME *name) | 336 | X509_find_by_subject(STACK_OF(X509) *sk, X509_NAME *name) |
| @@ -345,7 +345,7 @@ X509_find_by_subject(STACK_OF(X509) *sk, X509_NAME *name) | |||
| 345 | } | 345 | } |
| 346 | return (NULL); | 346 | return (NULL); |
| 347 | } | 347 | } |
| 348 | LCRYPTO_ALIAS(X509_find_by_subject) | 348 | LCRYPTO_ALIAS(X509_find_by_subject); |
| 349 | 349 | ||
| 350 | EVP_PKEY * | 350 | EVP_PKEY * |
| 351 | X509_get_pubkey(X509 *x) | 351 | X509_get_pubkey(X509 *x) |
| @@ -354,7 +354,7 @@ X509_get_pubkey(X509 *x) | |||
| 354 | return (NULL); | 354 | return (NULL); |
| 355 | return (X509_PUBKEY_get(x->cert_info->key)); | 355 | return (X509_PUBKEY_get(x->cert_info->key)); |
| 356 | } | 356 | } |
| 357 | LCRYPTO_ALIAS(X509_get_pubkey) | 357 | LCRYPTO_ALIAS(X509_get_pubkey); |
| 358 | 358 | ||
| 359 | EVP_PKEY * | 359 | EVP_PKEY * |
| 360 | X509_get0_pubkey(const X509 *x) | 360 | X509_get0_pubkey(const X509 *x) |
| @@ -363,7 +363,7 @@ X509_get0_pubkey(const X509 *x) | |||
| 363 | return (NULL); | 363 | return (NULL); |
| 364 | return (X509_PUBKEY_get0(x->cert_info->key)); | 364 | return (X509_PUBKEY_get0(x->cert_info->key)); |
| 365 | } | 365 | } |
| 366 | LCRYPTO_ALIAS(X509_get0_pubkey) | 366 | LCRYPTO_ALIAS(X509_get0_pubkey); |
| 367 | 367 | ||
| 368 | ASN1_BIT_STRING * | 368 | ASN1_BIT_STRING * |
| 369 | X509_get0_pubkey_bitstr(const X509 *x) | 369 | X509_get0_pubkey_bitstr(const X509 *x) |
| @@ -372,7 +372,7 @@ X509_get0_pubkey_bitstr(const X509 *x) | |||
| 372 | return NULL; | 372 | return NULL; |
| 373 | return x->cert_info->key->public_key; | 373 | return x->cert_info->key->public_key; |
| 374 | } | 374 | } |
| 375 | LCRYPTO_ALIAS(X509_get0_pubkey_bitstr) | 375 | LCRYPTO_ALIAS(X509_get0_pubkey_bitstr); |
| 376 | 376 | ||
| 377 | int | 377 | int |
| 378 | X509_check_private_key(const X509 *x, const EVP_PKEY *k) | 378 | X509_check_private_key(const X509 *x, const EVP_PKEY *k) |
| @@ -403,7 +403,7 @@ X509_check_private_key(const X509 *x, const EVP_PKEY *k) | |||
| 403 | return 1; | 403 | return 1; |
| 404 | return 0; | 404 | return 0; |
| 405 | } | 405 | } |
| 406 | LCRYPTO_ALIAS(X509_check_private_key) | 406 | LCRYPTO_ALIAS(X509_check_private_key); |
| 407 | 407 | ||
| 408 | /* | 408 | /* |
| 409 | * Not strictly speaking an "up_ref" as a STACK doesn't have a reference | 409 | * Not strictly speaking an "up_ref" as a STACK doesn't have a reference |
| @@ -422,4 +422,4 @@ X509_chain_up_ref(STACK_OF(X509) *chain) | |||
| 422 | 422 | ||
| 423 | return ret; | 423 | return ret; |
| 424 | } | 424 | } |
| 425 | LCRYPTO_ALIAS(X509_chain_up_ref) | 425 | LCRYPTO_ALIAS(X509_chain_up_ref); |
