From: Dr. Stephen Henson Date: Sat, 12 Sep 2009 23:18:43 +0000 (+0000) Subject: PR: 2025 X-Git-Tag: OpenSSL_0_9_8m-beta1~113 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=07cb0a82d12916aa57ef9ed4c5d0b25cc7ffa278;p=oweals%2Fopenssl.git 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 b60f52be5e..5982616222 100644 --- a/ssl/ssl.h +++ b/ssl/ssl.h @@ -1532,7 +1532,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 5aa03ee449..5e2d436da3 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -1095,7 +1095,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;