From fdaf7beec52cbe67332f2e5ad3b4f383153dbeb6 Mon Sep 17 00:00:00 2001 From: FdaSilvaYY Date: Sat, 9 Jul 2016 00:43:28 +0200 Subject: [PATCH] Constify ... X509_REVOKED_get0_extensions X509_check_private_key Reviewed-by: Matt Caswell Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/1300) --- crypto/x509/x509_cmp.c | 6 +++--- crypto/x509/x509cset.c | 2 +- doc/crypto/X509V3_get_d2i.pod | 2 +- doc/crypto/X509_get_pubkey.pod | 2 +- include/openssl/x509.h | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c index 63cef40e40..191a8b051f 100644 --- a/crypto/x509/x509_cmp.c +++ b/crypto/x509/x509_cmp.c @@ -257,7 +257,7 @@ X509 *X509_find_by_subject(STACK_OF(X509) *sk, X509_NAME *name) return (NULL); } -EVP_PKEY *X509_get0_pubkey(X509 *x) +EVP_PKEY *X509_get0_pubkey(const X509 *x) { if (x == NULL) return NULL; @@ -271,9 +271,9 @@ EVP_PKEY *X509_get_pubkey(X509 *x) return X509_PUBKEY_get(x->cert_info.key); } -int X509_check_private_key(X509 *x, EVP_PKEY *k) +int X509_check_private_key(const X509 *x, const EVP_PKEY *k) { - EVP_PKEY *xk; + const EVP_PKEY *xk; int ret; xk = X509_get0_pubkey(x); diff --git a/crypto/x509/x509cset.c b/crypto/x509/x509cset.c index 43ff668b71..3763492510 100644 --- a/crypto/x509/x509cset.c +++ b/crypto/x509/x509cset.c @@ -178,7 +178,7 @@ int X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial) return 1; } -STACK_OF(X509_EXTENSION) *X509_REVOKED_get0_extensions(X509_REVOKED *r) +STACK_OF(X509_EXTENSION) *X509_REVOKED_get0_extensions(const X509_REVOKED *r) { return r->extensions; } diff --git a/doc/crypto/X509V3_get_d2i.pod b/doc/crypto/X509V3_get_d2i.pod index 5a5415cf70..126393e408 100644 --- a/doc/crypto/X509V3_get_d2i.pod +++ b/doc/crypto/X509V3_get_d2i.pod @@ -34,7 +34,7 @@ X509_REVOKED_add1_ext_i2d - X509 extension decode and encode functions STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x); STACK_OF(X509_EXTENSION) *X509_CRL_get0_extensions(X509_CRL *crl); - STACK_OF(X509_EXTENSION) *X509_REVOKED_get0_extensions(X509_REVOKED *r); + STACK_OF(X509_EXTENSION) *X509_REVOKED_get0_extensions(const X509_REVOKED *r); =head1 DESCRIPTION diff --git a/doc/crypto/X509_get_pubkey.pod b/doc/crypto/X509_get_pubkey.pod index 2a5718fd29..2b9a956c2d 100644 --- a/doc/crypto/X509_get_pubkey.pod +++ b/doc/crypto/X509_get_pubkey.pod @@ -12,7 +12,7 @@ public key #include EVP_PKEY *X509_get_pubkey(X509 *x); - EVP_PKEY *X509_get0_pubkey(X509 *x); + EVP_PKEY *X509_get0_pubkey(const X509 *x); int X509_set_pubkey(X509 *x, EVP_PKEY *pkey); X509_PUBKEY *X509_get_X509_PUBKEY(X509 *x); diff --git a/include/openssl/x509.h b/include/openssl/x509.h index 11af4f1921..2447c3583c 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -633,7 +633,7 @@ STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x); void X509_get0_uids(ASN1_BIT_STRING **piuid, ASN1_BIT_STRING **psuid, X509 *x); X509_ALGOR *X509_get0_tbs_sigalg(X509 *x); -EVP_PKEY *X509_get0_pubkey(X509 *x); +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); int X509_certificate_type(X509 *x, EVP_PKEY *pubkey /* optional */ ); @@ -696,14 +696,14 @@ ASN1_INTEGER *X509_REVOKED_get0_serialNumber(X509_REVOKED *x); int X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial); ASN1_TIME *X509_REVOKED_get0_revocationDate(X509_REVOKED *x); int X509_REVOKED_set_revocationDate(X509_REVOKED *r, ASN1_TIME *tm); -STACK_OF(X509_EXTENSION) *X509_REVOKED_get0_extensions(X509_REVOKED *r); +STACK_OF(X509_EXTENSION) *X509_REVOKED_get0_extensions(const X509_REVOKED *r); X509_CRL *X509_CRL_diff(X509_CRL *base, X509_CRL *newer, EVP_PKEY *skey, const EVP_MD *md, unsigned int flags); int X509_REQ_check_private_key(X509_REQ *x509, EVP_PKEY *pkey); -int X509_check_private_key(X509 *x509, EVP_PKEY *pkey); +int X509_check_private_key(const X509 *x509, const EVP_PKEY *pkey); int X509_chain_check_suiteb(int *perror_depth, X509 *x, STACK_OF(X509) *chain, unsigned long flags); -- GitLab