diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2015-02-06 01:37:12 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2015-02-06 01:37:12 +0000 |
| commit | 8c3c654d8045516d8a72039b7aac72dcf5a009c1 (patch) | |
| tree | efc2d42812d9e5fcdc8999525cf1b6b54f942952 | |
| parent | 4e0661c9c49b2d408ee9136cfa78f285d6b42940 (diff) | |
Rename SSL_CTX_use_certificate_chain() to SSL_CTX_use_certificate_chain_mem().
As discussed with beck@ jsing@ and others
OK beck@
| -rw-r--r-- | lib/libssl/doc/SSL_CTX_use_certificate.3 | 10 | ||||
| -rw-r--r-- | lib/libssl/ssl.h | 4 | ||||
| -rw-r--r-- | lib/libssl/ssl_rsa.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/libssl/doc/SSL_CTX_use_certificate.3 b/lib/libssl/doc/SSL_CTX_use_certificate.3 index 45345f30c1b..6282c3b0d72 100644 --- a/lib/libssl/doc/SSL_CTX_use_certificate.3 +++ b/lib/libssl/doc/SSL_CTX_use_certificate.3 @@ -1,7 +1,7 @@ .\" -.\" $OpenBSD: SSL_CTX_use_certificate.3,v 1.2 2014/12/02 14:11:01 jmc Exp $ +.\" $OpenBSD: SSL_CTX_use_certificate.3,v 1.3 2015/02/06 01:37:11 reyk Exp $ .\" -.Dd $Mdocdate: December 2 2014 $ +.Dd $Mdocdate: February 6 2015 $ .Dt SSL_CTX_USE_CERTIFICATE 3 .Os .Sh NAME @@ -11,8 +11,8 @@ .Nm SSL_use_certificate , .Nm SSL_use_certificate_ASN1 , .Nm SSL_use_certificate_file , -.Nm SSL_CTX_use_certificate_chain , .Nm SSL_CTX_use_certificate_chain_file , +.Nm SSL_CTX_use_certificate_chain_mem , .Nm SSL_CTX_use_PrivateKey , .Nm SSL_CTX_use_PrivateKey_ASN1 , .Nm SSL_CTX_use_PrivateKey_file , @@ -43,10 +43,10 @@ .Ft int .Fn SSL_use_certificate_file "SSL *ssl" "const char *file" "int type" .Ft int -.Fn SSL_CTX_use_certificate_chain "SSL_CTX *ctx" "void *buf" "int len" -.Ft int .Fn SSL_CTX_use_certificate_chain_file "SSL_CTX *ctx" "const char *file" .Ft int +.Fn SSL_CTX_use_certificate_chain_mem "SSL_CTX *ctx" "void *buf" "int len" +.Ft int .Fn SSL_CTX_use_PrivateKey "SSL_CTX *ctx" "EVP_PKEY *pkey" .Ft int .Fo SSL_CTX_use_PrivateKey_ASN1 diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h index 59ae1b52445..275743a6a06 100644 --- a/lib/libssl/ssl.h +++ b/lib/libssl/ssl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.h,v 1.78 2015/01/26 13:06:39 jsing Exp $ */ +/* $OpenBSD: ssl.h,v 1.79 2015/02/06 01:37:11 reyk Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1585,7 +1585,7 @@ int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type); int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type); int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type); int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file); /* PEM type */ -int SSL_CTX_use_certificate_chain(SSL_CTX *ctx, void *buf, int len); +int SSL_CTX_use_certificate_chain_mem(SSL_CTX *ctx, void *buf, int len); STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file); int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs, const char *file); diff --git a/lib/libssl/ssl_rsa.c b/lib/libssl/ssl_rsa.c index ac105d073a8..039bee7952b 100644 --- a/lib/libssl/ssl_rsa.c +++ b/lib/libssl/ssl_rsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_rsa.c,v 1.19 2014/12/14 15:30:50 jsing Exp $ */ +/* $OpenBSD: ssl_rsa.c,v 1.20 2015/02/06 01:37:11 reyk Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -736,7 +736,7 @@ end: } int -SSL_CTX_use_certificate_chain(SSL_CTX *ctx, void *buf, int len) +SSL_CTX_use_certificate_chain_mem(SSL_CTX *ctx, void *buf, int len) { BIO *in; int ret = 0; |