Rename SSL_CTX_use_certificate_chain() to SSL_CTX_use_certificate_chain_mem().

As discussed with beck@ jsing@ and others
OK beck@

8 files changed, 22 insertions, 21 deletions

diff --git a/src/lib/libssl/doc/SSL_CTX_use_certificate.3 b/src/lib/libssl/doc/SSL_CTX_use_certificate.3
index 45345f30c1..6282c3b0d7 100644
--- a/src/lib/libssl/doc/SSL_CTX_use_certificate.3
+++ b/src/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/src/lib/libssl/man/Makefile b/src/lib/libssl/man/Makefile
index 25a2972144..d45322cc30 100644
--- a/src/lib/libssl/man/Makefile
+++ b/src/lib/libssl/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2015/01/16 01:58:17 schwarze Exp $
+# $OpenBSD: Makefile,v 1.31 2015/02/06 01:37:11 reyk Exp $
 
 .include <bsd.own.mk>           # for NOMAN
 
@@ -200,6 +200,7 @@ MLINKS+=\
         SSL_CTX_use_certificate.3 SSL_CTX_use_RSAPrivateKey_file.3 \
         SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_ASN1.3 \
         SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_chain_file.3 \
+        SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_chain_mem.3 \
         SSL_CTX_use_certificate.3 SSL_CTX_use_certificate_file.3 \
         SSL_CTX_use_certificate.3 SSL_check_private_key.3 \
         SSL_CTX_use_certificate.3 SSL_use_PrivateKey.3 \
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_use_certificate.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_use_certificate.3
index 45345f30c1..6282c3b0d7 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_use_certificate.3
+++ b/src/lib/libssl/src/doc/ssl/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/src/lib/libssl/src/ssl/ssl.h b/src/lib/libssl/src/ssl/ssl.h
index 59ae1b5244..275743a6a0 100644
--- a/src/lib/libssl/src/ssl/ssl.h
+++ b/src/lib/libssl/src/ssl/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/src/lib/libssl/src/ssl/ssl_rsa.c b/src/lib/libssl/src/ssl/ssl_rsa.c
index ac105d073a..039bee7952 100644
--- a/src/lib/libssl/src/ssl/ssl_rsa.c
+++ b/src/lib/libssl/src/ssl/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;
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 59ae1b5244..275743a6a0 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/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/src/lib/libssl/ssl_rsa.c b/src/lib/libssl/ssl_rsa.c
index ac105d073a..039bee7952 100644
--- a/src/lib/libssl/ssl_rsa.c
+++ b/src/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;
diff --git a/src/lib/libtls/tls.c b/src/lib/libtls/tls.c
index 0b9f12511d..2ca5336260 100644
--- a/src/lib/libtls/tls.c
+++ b/src/lib/libtls/tls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls.c,v 1.4 2014/12/17 17:51:33 doug Exp $ */
+/* $OpenBSD: tls.c,v 1.5 2015/02/06 01:37:11 reyk Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -116,7 +116,7 @@ tls_configure_keypair(struct tls *ctx)
                         goto err;
                 }
 
-                if (SSL_CTX_use_certificate_chain(ctx->ssl_ctx,
+                if (SSL_CTX_use_certificate_chain_mem(ctx->ssl_ctx,
                     ctx->config->cert_mem, ctx->config->cert_len) != 1) {
                         tls_set_error(ctx, "failed to load certificate");
                         goto err;