From: Dr. Matthias St. Pierre Date: Fri, 12 Jul 2019 09:59:42 +0000 (+0200) Subject: x509: sort X509 dup functions alphabetically X-Git-Tag: openssl-3.0.0-alpha1~1751 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=227d426554e8dcbb7e3f4f2b5e86112359ca104a;p=oweals%2Fopenssl.git x509: sort X509 dup functions alphabetically Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9353) --- diff --git a/doc/man3/X509_dup.pod b/doc/man3/X509_dup.pod index 526a6d68bf..6befa1e26a 100644 --- a/doc/man3/X509_dup.pod +++ b/doc/man3/X509_dup.pod @@ -118,8 +118,8 @@ OCSP_SINGLERESP_free, OCSP_SINGLERESP_new, OSSL_CMP_ITAV_free, OSSL_CMP_MSG_dup, -OSSL_CMP_MSG_it, OSSL_CMP_MSG_free, +OSSL_CMP_MSG_it, OSSL_CMP_PKIHEADER_free, OSSL_CMP_PKIHEADER_it, OSSL_CMP_PKIHEADER_new, @@ -199,10 +199,10 @@ POLICY_CONSTRAINTS_free, POLICY_CONSTRAINTS_new, POLICY_MAPPING_free, POLICY_MAPPING_new, -PROFESSION_INFO_free, -PROFESSION_INFO_new, PROFESSION_INFOS_free, PROFESSION_INFOS_new, +PROFESSION_INFO_free, +PROFESSION_INFO_new, PROXY_CERT_INFO_EXTENSION_free, PROXY_CERT_INFO_EXTENSION_new, PROXY_POLICY_free, diff --git a/include/openssl/x509.h b/include/openssl/x509.h index 6e4d1e768f..66b44f4e06 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -466,12 +466,12 @@ int i2d_PUBKEY_bio(BIO *bp, const EVP_PKEY *pkey); EVP_PKEY *d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a); DECLARE_ASN1_DUP_FUNCTION(X509) +DECLARE_ASN1_DUP_FUNCTION(X509_ALGOR) DECLARE_ASN1_DUP_FUNCTION(X509_ATTRIBUTE) -DECLARE_ASN1_DUP_FUNCTION(X509_EXTENSION) DECLARE_ASN1_DUP_FUNCTION(X509_CRL) -DECLARE_ASN1_DUP_FUNCTION(X509_REVOKED) +DECLARE_ASN1_DUP_FUNCTION(X509_EXTENSION) DECLARE_ASN1_DUP_FUNCTION(X509_REQ) -DECLARE_ASN1_DUP_FUNCTION(X509_ALGOR) +DECLARE_ASN1_DUP_FUNCTION(X509_REVOKED) int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval); void X509_ALGOR_get0(const ASN1_OBJECT **paobj, int *pptype,