From: tedu <tedu@openbsd.org>
Date: Sat, 3 May 2014 17:12:53 +0000 (+0000)
Subject: now that 5.5 has been released with compatibility for 2b hashes,
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6b630d867b6dbf766f0cab3b6d32c3fc1da8270f;p=openbsd

now that 5.5 has been released with compatibility for 2b hashes,
switch to generating them by default. prodded by deraadt and sthen
---

diff --git a/lib/libc/crypt/bcrypt.c b/lib/libc/crypt/bcrypt.c
index 8c6d50c0a61..4656ca656b9 100644
--- a/lib/libc/crypt/bcrypt.c
+++ b/lib/libc/crypt/bcrypt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bcrypt.c,v 1.40 2014/05/03 16:33:35 tedu Exp $	*/
+/*	$OpenBSD: bcrypt.c,v 1.41 2014/05/03 17:12:53 tedu Exp $	*/
 
 /*
  * Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
@@ -73,7 +73,7 @@ bcrypt_initsalt(int log_rounds, uint8_t *salt, size_t saltbuflen)
 	else if (log_rounds > 31)
 		log_rounds = 31;
 
-	snprintf(salt, saltbuflen, "$2a$%2.2u$", log_rounds);
+	snprintf(salt, saltbuflen, "$2b$%2.2u$", log_rounds);
 	encode_base64(salt + 7, csalt, sizeof(csalt));
 
 	return 0;