From: Dr. Stephen Henson Date: Sat, 12 Sep 2009 23:17:39 +0000 (+0000) Subject: PR: 2025 X-Git-Tag: OpenSSL-fips-2_0-rc1~1537 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7689ed34d3e0111b08d354a874b12f362e8a8390;p=openssl PR: 2025 Submitted by: Tomas Mraz Approved by: steve@openssl.org Constify SSL_CIPHER_description --- diff --git a/doc/ssl/SSL_CIPHER_get_name.pod b/doc/ssl/SSL_CIPHER_get_name.pod index f62a869a9b..eb772b55de 100644 --- a/doc/ssl/SSL_CIPHER_get_name.pod +++ b/doc/ssl/SSL_CIPHER_get_name.pod @@ -11,7 +11,7 @@ SSL_CIPHER_get_name, SSL_CIPHER_get_bits, SSL_CIPHER_get_version, SSL_CIPHER_des const char *SSL_CIPHER_get_name(const SSL_CIPHER *cipher); int SSL_CIPHER_get_bits(const SSL_CIPHER *cipher, int *alg_bits); char *SSL_CIPHER_get_version(const SSL_CIPHER *cipher); - char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int size); + char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int size); =head1 DESCRIPTION diff --git a/ssl/ssl.h b/ssl/ssl.h index 63bdf42971..8e901b913c 100644 --- a/ssl/ssl.h +++ b/ssl/ssl.h @@ -1661,7 +1661,7 @@ long SSL_get_default_timeout(const SSL *s); int SSL_library_init(void ); -char *SSL_CIPHER_description(SSL_CIPHER *,char *buf,int size); +char *SSL_CIPHER_description(const SSL_CIPHER *,char *buf,int size); STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk); SSL *SSL_dup(SSL *ssl); diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 87c5f61670..bee3507ea1 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -1451,7 +1451,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method, return(cipherstack); } -char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len) +char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len) { int is_export,pkl,kl; const char *ver,*exp_str;