aboutsummaryrefslogtreecommitdiffstats
path: root/ssl/ssl_lib.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2000-01-22 03:17:06 +0000
committerDr. Stephen Henson <steve@openssl.org>2000-01-22 03:17:06 +0000
commit018e57c74d9dc6b5676aead4be11cd28a8617ea4 (patch)
tree4975f3d313b24af7ecd5d1ab0741cce0176143f8 /ssl/ssl_lib.c
parent3604a4d3d17620b1c1610e337cbe705cf8f67b0c (diff)
downloadopenssl-018e57c74d9dc6b5676aead4be11cd28a8617ea4.tar.gz
Apply Lutz Behnke's 56 bit cipher patch with a few
minor changes. Docs haven't been added at this stage. They are probably best included in the 'ciphers' program docs.
Diffstat (limited to 'ssl/ssl_lib.c')
-rw-r--r--ssl/ssl_lib.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 39ee0280b8..4d74f6e45c 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -923,7 +923,7 @@ const char *SSL_get_cipher_list(SSL *s,int n)
}
/** specify the ciphers to be used by default by the SSL_CTX */
-int SSL_CTX_set_cipher_list(SSL_CTX *ctx,char *str)
+int SSL_CTX_set_cipher_list(SSL_CTX *ctx, const char *str)
{
STACK_OF(SSL_CIPHER) *sk;
@@ -934,7 +934,7 @@ int SSL_CTX_set_cipher_list(SSL_CTX *ctx,char *str)
}
/** specify the ciphers to be used by the SSL */
-int SSL_set_cipher_list(SSL *s,char *str)
+int SSL_set_cipher_list(SSL *s,const char *str)
{
STACK_OF(SSL_CIPHER) *sk;
@@ -1362,7 +1362,7 @@ X509 *ssl_get_server_send_cert(SSL *s)
c=s->cert;
ssl_set_cert_masks(c, s->s3->tmp.new_cipher);
alg=s->s3->tmp.new_cipher->algorithms;
- is_export=SSL_IS_EXPORT(alg);
+ is_export=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher);
mask=is_export?c->export_mask:c->mask;
kalg=alg&(SSL_MKEY_MASK|SSL_AUTH_MASK);