From 81f9ce1e1965e0e33db6d2391285c4c1b6af0434 Mon Sep 17 00:00:00 2001 From: FdaSilvaYY Date: Thu, 15 Sep 2016 21:37:14 +0200 Subject: [PATCH] Constify code about X509_VERIFY_PARAM Reviewed-by: Viktor Dukhovni Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/1594) --- crypto/x509/x509_vpm.c | 4 ++-- doc/crypto/X509_VERIFY_PARAM_set_flags.pod | 4 ++-- doc/ssl/SSL_set1_host.pod | 2 +- include/openssl/ssl.h | 2 +- include/openssl/x509_vfy.h | 4 ++-- ssl/ssl_lib.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c index 05c785217a..2ea39c8816 100644 --- a/crypto/x509/x509_vpm.c +++ b/crypto/x509/x509_vpm.c @@ -301,7 +301,7 @@ int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param, return 1; } -unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param) +unsigned long X509_VERIFY_PARAM_get_flags(const X509_VERIFY_PARAM *param) { return param->flags; } @@ -396,7 +396,7 @@ void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, param->hostflags = flags; } -char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *param) +const char *X509_VERIFY_PARAM_get0_peername(const X509_VERIFY_PARAM *param) { return param->peername; } diff --git a/doc/crypto/X509_VERIFY_PARAM_set_flags.pod b/doc/crypto/X509_VERIFY_PARAM_set_flags.pod index 2800cd441d..528a53aee4 100644 --- a/doc/crypto/X509_VERIFY_PARAM_set_flags.pod +++ b/doc/crypto/X509_VERIFY_PARAM_set_flags.pod @@ -12,7 +12,7 @@ X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_ge unsigned long flags); int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param, unsigned long flags); - unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param); + unsigned long X509_VERIFY_PARAM_get_flags(const X509_VERIFY_PARAM *param); int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose); int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust); @@ -37,7 +37,7 @@ X509_VERIFY_PARAM_set_flags, X509_VERIFY_PARAM_clear_flags, X509_VERIFY_PARAM_ge const char *name, size_t namelen); void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, unsigned int flags); - char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *param); + const char *X509_VERIFY_PARAM_get0_peername(const X509_VERIFY_PARAM *param); int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param, const char *email, size_t emaillen); int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *param, diff --git a/doc/ssl/SSL_set1_host.pod b/doc/ssl/SSL_set1_host.pod index 3339a0e803..d254fe7483 100644 --- a/doc/ssl/SSL_set1_host.pod +++ b/doc/ssl/SSL_set1_host.pod @@ -12,7 +12,7 @@ SSL server verification parameters int SSL_set1_host(SSL *s, const char *hostname); int SSL_add1_host(SSL *s, const char *hostname); void SSL_set_hostflags(SSL *s, unsigned int flags); - const char *SSL_get0_peername(SSL *s); + const char *SSL_get0_peername(const SSL *s); =head1 DESCRIPTION diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index af6d9b5ad6..1fcdbd2267 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1493,7 +1493,7 @@ __owur int SSL_set_trust(SSL *s, int trust); __owur int SSL_set1_host(SSL *s, const char *hostname); __owur int SSL_add1_host(SSL *s, const char *hostname); -__owur const char *SSL_get0_peername(SSL *s); +__owur const char *SSL_get0_peername(const SSL *s); void SSL_set_hostflags(SSL *s, unsigned int flags); __owur int SSL_CTX_dane_enable(SSL_CTX *ctx); diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h index cab8005eee..12984f0055 100644 --- a/include/openssl/x509_vfy.h +++ b/include/openssl/x509_vfy.h @@ -453,7 +453,7 @@ int X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param, unsigned long flags); int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param, unsigned long flags); -unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param); +unsigned long X509_VERIFY_PARAM_get_flags(const X509_VERIFY_PARAM *param); int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose); int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust); void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth); @@ -470,7 +470,7 @@ int X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param, const char *name, size_t namelen); void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, unsigned int flags); -char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *); +const char *X509_VERIFY_PARAM_get0_peername(const X509_VERIFY_PARAM *); void X509_VERIFY_PARAM_move_peername(X509_VERIFY_PARAM *, X509_VERIFY_PARAM *); int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param, const char *email, size_t emaillen); diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index bd0fbf8101..27a16ef6f4 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -795,7 +795,7 @@ void SSL_set_hostflags(SSL *s, unsigned int flags) X509_VERIFY_PARAM_set_hostflags(s->param, flags); } -const char *SSL_get0_peername(SSL *s) +const char *SSL_get0_peername(const SSL *s) { return X509_VERIFY_PARAM_get0_peername(s->param); } -- GitLab