From ebdedc24667b067cbc2b1b1d24f0c7ca3000715c Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Mon, 22 Jan 2024 19:26:55 +0000
Subject: [PATCH] make login.conf(5) and crypt_newhash(3) and the underlying
 code consistant regarding bcrypt,a instead of blowfish,a.  "blowfish" is a
 historical alias which we don't need to document as firmly as "bcrypt".
 report about difficult manual page discovery from ataraxia937 ok millert

---
 lib/libc/crypt/cryptutil.c  | 4 ++--
 share/man/man5/login.conf.5 | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/libc/crypt/cryptutil.c b/lib/libc/crypt/cryptutil.c
index f48ba1af2c2..f5fdb295890 100644
--- a/lib/libc/crypt/cryptutil.c
+++ b/lib/libc/crypt/cryptutil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptutil.c,v 1.12 2015/09/13 15:33:48 guenther Exp $ */
+/* $OpenBSD: cryptutil.c,v 1.13 2024/01/22 19:26:55 deraadt Exp $ */
 /*
  * Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
  *
@@ -54,7 +54,7 @@ int
 crypt_newhash(const char *pass, const char *pref, char *hash, size_t hashlen)
 {
 	int rv = -1;
-	const char *defaultpref = "blowfish,8";
+	const char *defaultpref = "bcrypt,8";
 	const char *errstr;
 	const char *choices[] = { "blowfish", "bcrypt" };
 	size_t maxchoice = sizeof(choices) / sizeof(choices[0]);
diff --git a/share/man/man5/login.conf.5 b/share/man/man5/login.conf.5
index e2fad4fa34c..3d6d92a14c3 100644
--- a/share/man/man5/login.conf.5
+++ b/share/man/man5/login.conf.5
@@ -30,10 +30,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $OpenBSD: login.conf.5,v 1.71 2023/12/29 11:57:38 claudio Exp $
+.\" $OpenBSD: login.conf.5,v 1.72 2024/01/22 19:26:55 deraadt Exp $
 .\" BSDI $From: login.conf.5,v 2.20 2000/06/26 14:50:38 prb Exp $
 .\"
-.Dd $Mdocdate: December 29 2023 $
+.Dd $Mdocdate: January 22 2024 $
 .Dt LOGIN.CONF 5
 .Os
 .Sh NAME
@@ -98,7 +98,7 @@ file are either boolean or use a
 .Ql =
 to separate the capability from the value.
 The types are described after the capability table.
-.Bl -column "approve-service" "program" "blowfish,8" "Description"
+.Bl -column "approve-service" "program" "bcrypt,8" "Description"
 .It Sy Name Ta Sy Type Ta Sy Default Ta Sy Description
 .\"
 .It approve Ta program Ta "" Ta
@@ -165,7 +165,7 @@ See
 .Xr login 1 .
 .\"
 .Pp
-.It localcipher Ta string Ta blowfish,a Ta
+.It localcipher Ta string Ta bcrypt,a Ta
 The cipher to use for encrypting passwords.
 Refer to
 .Xr crypt_newhash 3
-- 
2.20.1