diff options
| author | David Benjamin <davidben@google.com> | 2021-03-11 14:43:04 -0500 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-04-28 11:40:06 +0200 |
| commit | cdf63a3736a91a534bd3bc952b1dc3ef714604dd (patch) | |
| tree | f1c2986418c09bd6a8933d024475ede09f44c687 /include | |
| parent | d97adfda2868aeb9e62df96216203e8120a95d6d (diff) | |
Add X509 version constants.
The X509 version APIs return the numerical values of the version
numbers, which are one off from the names. This is a bit confusing.
Where they don't get it wrong (accidentally making an "X509v4"
certificate), callers tend to try commenting every call site to explain
the mismatch, including in OpenSSL itself.
Define constants for these values, so code can be self-documenting and
callers are nudged towards the right values.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14549)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/x509.h.in | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/openssl/x509.h.in b/include/openssl/x509.h.in index 0205781e0c..cd28bd1d70 100644 --- a/include/openssl/x509.h.in +++ b/include/openssl/x509.h.in @@ -688,6 +688,10 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2, ASN1_BIT_STRING *signature, const void *data, EVP_MD_CTX *ctx); +#define X509_VERSION_1 0 +#define X509_VERSION_2 1 +#define X509_VERSION_3 2 + long X509_get_version(const X509 *x); int X509_set_version(X509 *x, long version); int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial); @@ -729,6 +733,8 @@ EVP_PKEY *X509_get0_pubkey(const X509 *x); EVP_PKEY *X509_get_pubkey(X509 *x); ASN1_BIT_STRING *X509_get0_pubkey_bitstr(const X509 *x); +#define X509_REQ_VERSION_1 0 + long X509_REQ_get_version(const X509_REQ *req); int X509_REQ_set_version(X509_REQ *x, long version); X509_NAME *X509_REQ_get_subject_name(const X509_REQ *req); /* TODO change to get0_ */ @@ -767,6 +773,9 @@ int X509_REQ_add1_attr_by_txt(X509_REQ *req, const char *attrname, int type, const unsigned char *bytes, int len); +#define X509_CRL_VERSION_1 0 +#define X509_CRL_VERSION_2 1 + int X509_CRL_set_version(X509_CRL *x, long version); int X509_CRL_set_issuer_name(X509_CRL *x, const X509_NAME *name); int X509_CRL_set1_lastUpdate(X509_CRL *x, const ASN1_TIME *tm); |