PR: 2025

Submitted by: Tomas Mraz <tmraz@redhat.com>
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 f62a869a9bbac39b9a34a22e2818349201f4a249..eb772b55de4aea2588af96b4c210c02c298b877f 100644 (file)
--- 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);
  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
 
 
 =head1 DESCRIPTION
 

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 63bdf429710031183e51ae9545e79ab3924811e8..8e901b913ce606651a0b1e3bacbac7f623af22b1 100644 (file)
--- 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 );
 
 
 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);
 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 87c5f61670007305f8c7777068b9c6fb294e2056..bee3507ea18a904c8042017f4f2371080c77abcd 100644 (file)
--- 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);
        }
 
        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;
        {
        int is_export,pkl,kl;
        const char *ver,*exp_str;