From: Dr. Stephen Henson Date: Wed, 17 Aug 2016 14:49:36 +0000 (+0100) Subject: Constify ssl_cert_type() X-Git-Tag: OpenSSL_1_1_0~154 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2e5ead831b1a92d78113b00978f8b3323268469f;p=oweals%2Fopenssl.git Constify ssl_cert_type() Reviewed-by: Richard Levitte --- diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index a555f09822..e7084fc7e8 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1858,7 +1858,7 @@ __owur CERT_PKEY *ssl_get_server_send_pkey(SSL *s); __owur int ssl_get_server_cert_serverinfo(SSL *s, const unsigned char **serverinfo, size_t *serverinfo_length); __owur EVP_PKEY *ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *c, const EVP_MD **pmd); -__owur int ssl_cert_type(X509 *x, const EVP_PKEY *pkey); +__owur int ssl_cert_type(const X509 *x, const EVP_PKEY *pkey); void ssl_set_masks(SSL *s); __owur STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s); __owur int ssl_verify_alarm_type(long type); diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c index 87a76cd6e5..7cf84c70f1 100644 --- a/ssl/statem/statem_lib.c +++ b/ssl/statem/statem_lib.c @@ -520,7 +520,7 @@ int tls_get_message_body(SSL *s, unsigned long *len) return 1; } -int ssl_cert_type(X509 *x, const EVP_PKEY *pk) +int ssl_cert_type(const X509 *x, const EVP_PKEY *pk) { if (pk == NULL && (pk = X509_get0_pubkey(x)) == NULL)