From: tb <tb@openbsd.org>
Date: Thu, 30 Jun 2022 09:08:35 +0000 (+0000)
Subject: Rename use_* to ssl_use_* for consistency.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9c40045402d32ce9b9e8c7bbb41d78cca4b04bfd;p=openbsd

Rename use_* to ssl_use_* for consistency.

discussed with jsing
---

diff --git a/lib/libssl/ssl_rsa.c b/lib/libssl/ssl_rsa.c
index 9a1f916e575..192dc4291e6 100644
--- a/lib/libssl/ssl_rsa.c
+++ b/lib/libssl/ssl_rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_rsa.c,v 1.44 2022/06/29 21:18:04 tb Exp $ */
+/* $OpenBSD: ssl_rsa.c,v 1.45 2022/06/30 09:08:35 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -70,8 +70,9 @@ static int ssl_get_password_cb_and_arg(SSL_CTX *ctx, SSL *ssl,
     pem_password_cb **passwd_cb, void **passwd_arg);
 static int ssl_set_cert(SSL_CTX *ctx, SSL *ssl, X509 *x509);
 static int ssl_set_pkey(SSL_CTX *ctx, SSL *ssl, EVP_PKEY *pkey);
-static int use_certificate_chain_bio(SSL_CTX *ctx, SSL *ssl, BIO *in);
-static int use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file);
+static int ssl_use_certificate_chain_bio(SSL_CTX *ctx, SSL *ssl, BIO *in);
+static int ssl_use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl,
+    const char *file);
 
 int
 SSL_use_certificate(SSL *ssl, X509 *x)
@@ -637,7 +638,7 @@ SSL_CTX_use_PrivateKey_ASN1(int type, SSL_CTX *ctx, const unsigned char *d,
  * sent to the peer in the Certificate message.
  */
 static int
-use_certificate_chain_bio(SSL_CTX *ctx, SSL *ssl, BIO *in)
+ssl_use_certificate_chain_bio(SSL_CTX *ctx, SSL *ssl, BIO *in)
 {
 	pem_password_cb *passwd_cb;
 	void *passwd_arg;
@@ -684,7 +685,7 @@ use_certificate_chain_bio(SSL_CTX *ctx, SSL *ssl, BIO *in)
 }
 
 int
-use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file)
+ssl_use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file)
 {
 	BIO *in;
 	int ret = 0;
@@ -700,7 +701,7 @@ use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file)
 		goto end;
 	}
 
-	ret = use_certificate_chain_bio(ctx, ssl, in);
+	ret = ssl_use_certificate_chain_bio(ctx, ssl, in);
 
  end:
 	BIO_free(in);
@@ -710,13 +711,13 @@ use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file)
 int
 SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file)
 {
-	return use_certificate_chain_file(ctx, NULL, file);
+	return ssl_use_certificate_chain_file(ctx, NULL, file);
 }
 
 int
 SSL_use_certificate_chain_file(SSL *ssl, const char *file)
 {
-	return use_certificate_chain_file(NULL, ssl, file);
+	return ssl_use_certificate_chain_file(NULL, ssl, file);
 }
 
 int
@@ -731,7 +732,7 @@ SSL_CTX_use_certificate_chain_mem(SSL_CTX *ctx, void *buf, int len)
 		goto end;
 	}
 
-	ret = use_certificate_chain_bio(ctx, NULL, in);
+	ret = ssl_use_certificate_chain_bio(ctx, NULL, in);
 
  end:
 	BIO_free(in);