Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream merge 2024 03 18 #1501

Merged
merged 13 commits into from
Apr 2, 2024
Merged

Upstream merge 2024 03 18 #1501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
56baf78
Remove EXFLAG_FRESHEST
davidben Nov 12, 2023
03c2d85
Don't parse delta CRL and CRL number extensions
davidben Nov 13, 2023
92a7f9f
Remove dcrl output parameter in CRL lookup logic
davidben Nov 12, 2023
bbe3362
Remove removedFromCRL handling
davidben Nov 12, 2023
2025859
Remove the redundant idp_reasons field
davidben Nov 12, 2023
cf0ad79
Don't process DistributionPoints with a reasons field
davidben Nov 12, 2023
f672ed5
Remove the now no-op CRL reasons loop
davidben Nov 12, 2023
2d2b9fd
Remove the delta CRL special case on expiry
davidben Nov 12, 2023
f4e80c7
Remove some remnants of indirect CRLs in CRL matching
davidben Nov 12, 2023
048aeb2
Unexport the idp_flags constants
davidben Nov 12, 2023
caf27e5
Use the ASN1_BOOLEAN typedef in ISSUING_DIST_POINT
davidben Nov 12, 2023
1b799d6
Remove support for the certificateIssuer CRL entry extension
davidben Nov 12, 2023
1ae65ac
Remove no longer reachable CRL path validation code
davidben Nov 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions crypto/x509/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,6 @@ struct x509_revoked_st {
ASN1_INTEGER *serialNumber;
ASN1_TIME *revocationDate;
STACK_OF(X509_EXTENSION) /* optional */ *extensions;
// Set up if indirect CRL
STACK_OF(GENERAL_NAME) *issuer;
// Revocation reason
int reason;
} /* X509_REVOKED */;
Expand All @@ -206,6 +204,22 @@ typedef struct {
// an |X509_NAME|.
DECLARE_ASN1_FUNCTIONS(X509_CRL_INFO)

// Values in idp_flags field
// IDP present
#define IDP_PRESENT 0x1
// IDP values inconsistent
#define IDP_INVALID 0x2
// onlyuser true
#define IDP_ONLYUSER 0x4
// onlyCA true
#define IDP_ONLYCA 0x8
// onlyattr true
#define IDP_ONLYATTR 0x10
// indirectCRL true
#define IDP_INDIRECT 0x20
// onlysomereasons present
#define IDP_REASONS 0x40

struct X509_crl_st {
// actual signature
X509_CRL_INFO *crl;
Expand All @@ -218,12 +232,7 @@ struct X509_crl_st {
ISSUING_DIST_POINT *idp;
// Convenient breakdown of IDP
int idp_flags;
int idp_reasons;
// CRL and base CRL numbers for delta processing
ASN1_INTEGER *crl_number;
ASN1_INTEGER *base_crl_number;
unsigned char crl_hash[SHA256_DIGEST_LENGTH];
STACK_OF(GENERAL_NAMES) *issuers;
} /* X509_CRL */;

struct X509_VERIFY_PARAM_st {
Expand Down Expand Up @@ -353,9 +362,6 @@ struct x509_store_ctx_st {
X509_CRL *current_crl; // current CRL

int current_crl_score; // score of current CRL
unsigned int current_reasons; // Reason mask

X509_STORE_CTX *parent; // For CRL path validation: parent context

CRYPTO_EX_DATA ex_data;
} /* X509_STORE_CTX */;
Expand Down
Loading
Loading