diff options
| author | Adam Šulc <sulcadam12@gmail.com> | 2023-07-20 21:30:45 +0200 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-07-24 12:53:02 +1000 |
| commit | db8e453e6461d8f79946badbd42eec0c505b47c4 (patch) | |
| tree | 7a330baffce94a021125b4b3c1283734c5504dd2 /include | |
| parent | cb80e6bf3d58588e8dc1d7c3168251c69a33c798 (diff) | |
fix: reject adding a duplicity into STACK_OF(X509_ATTRIBUTE)
Function `X509at_add1_attr()` (crypto/x509/x509_att.c) rejects to add a duplicity into `*x` but it searches in a wrong stack.
Changed to search in `*x`.
CLA: trivial
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21505)
(cherry picked from commit 7551264186f176ca5801aa84d60c7b91d8fba31f)
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/x509err.h | 2 | ||||
| -rw-r--r-- | include/openssl/x509err.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/crypto/x509err.h b/include/crypto/x509err.h index 53f567d92e..0a67975bd0 100644 --- a/include/crypto/x509err.h +++ b/include/crypto/x509err.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/include/openssl/x509err.h b/include/openssl/x509err.h index a56facd46b..34ead4b81a 100644 --- a/include/openssl/x509err.h +++ b/include/openssl/x509err.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -30,6 +30,7 @@ # define X509_R_CERT_ALREADY_IN_HASH_TABLE 101 # define X509_R_CRL_ALREADY_DELTA 127 # define X509_R_CRL_VERIFY_FAILURE 131 +# define X509_R_DUPLICATE_ATTRIBUTE 140 # define X509_R_ERROR_GETTING_MD_BY_NID 141 # define X509_R_ERROR_USING_SIGINF_SET 142 # define X509_R_IDP_MISMATCH 128 |