diff options
| -rw-r--r-- | src/lib/libcrypto/x509/x509_local.h | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509cset.c | 10 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/lib/libcrypto/x509/x509_local.h b/src/lib/libcrypto/x509/x509_local.h index 796a2ee718..5b9c1e51f7 100644 --- a/src/lib/libcrypto/x509/x509_local.h +++ b/src/lib/libcrypto/x509/x509_local.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_local.h,v 1.38 2025/03/06 07:20:01 tb Exp $ */ | 1 | /* $OpenBSD: x509_local.h,v 1.39 2025/10/10 11:31:13 tb Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2013. | 3 | * project 2013. |
| 4 | */ | 4 | */ |
| @@ -213,7 +213,6 @@ struct x509_revoked_st { | |||
| 213 | STACK_OF(GENERAL_NAME) *issuer; | 213 | STACK_OF(GENERAL_NAME) *issuer; |
| 214 | /* Revocation reason */ | 214 | /* Revocation reason */ |
| 215 | int reason; | 215 | int reason; |
| 216 | int sequence; /* load sequence */ | ||
| 217 | }; | 216 | }; |
| 218 | 217 | ||
| 219 | struct X509_crl_info_st { | 218 | struct X509_crl_info_st { |
diff --git a/src/lib/libcrypto/x509/x509cset.c b/src/lib/libcrypto/x509/x509cset.c index 468831266f..facca27880 100644 --- a/src/lib/libcrypto/x509/x509cset.c +++ b/src/lib/libcrypto/x509/x509cset.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509cset.c,v 1.22 2024/03/26 23:41:45 tb Exp $ */ | 1 | /* $OpenBSD: x509cset.c,v 1.23 2025/10/10 11:31:13 tb Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2001. | 3 | * project 2001. |
| 4 | */ | 4 | */ |
| @@ -156,15 +156,7 @@ LCRYPTO_ALIAS(X509_CRL_set1_nextUpdate); | |||
| 156 | int | 156 | int |
| 157 | X509_CRL_sort(X509_CRL *c) | 157 | X509_CRL_sort(X509_CRL *c) |
| 158 | { | 158 | { |
| 159 | X509_REVOKED *r; | ||
| 160 | int i; | ||
| 161 | |||
| 162 | /* Sort the data so it will be written in serial number order */ | ||
| 163 | sk_X509_REVOKED_sort(c->crl->revoked); | 159 | sk_X509_REVOKED_sort(c->crl->revoked); |
| 164 | for (i = 0; i < sk_X509_REVOKED_num(c->crl->revoked); i++) { | ||
| 165 | r = sk_X509_REVOKED_value(c->crl->revoked, i); | ||
| 166 | r->sequence = i; | ||
| 167 | } | ||
| 168 | c->crl->enc.modified = 1; | 160 | c->crl->enc.modified = 1; |
| 169 | return 1; | 161 | return 1; |
| 170 | } | 162 | } |
