From 9b5f70b93e038df5446bd37a4adac5a0380748e7 Mon Sep 17 00:00:00 2001
From: johannes <johannes.brechtmann@gmail.com>
Date: Wed, 21 Feb 2018 23:57:11 +0100
Subject: [PATCH] crypt_checkpass: include HAVE_CRYPT_H definition, add NULL
 check

---
 openbsd-compat/crypt_checkpass.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/openbsd-compat/crypt_checkpass.c b/openbsd-compat/crypt_checkpass.c
index dafd2dae..d10b3a57 100644
--- a/openbsd-compat/crypt_checkpass.c
+++ b/openbsd-compat/crypt_checkpass.c
@@ -1,5 +1,6 @@
 /* OPENBSD ORIGINAL: lib/libc/crypt/cryptutil.c */
 
+#include "includes.h"
 #include <errno.h>
 #ifdef HAVE_CRYPT_H
 #include <crypt.h>
@@ -10,6 +11,8 @@
 int
 crypt_checkpass(const char *pass, const char *goodhash)
 {
+	char *c;
+
 	if (goodhash == NULL)
 		goto fail;
 
@@ -17,7 +20,11 @@ crypt_checkpass(const char *pass, const char *goodhash)
 	if (strlen(goodhash) == 0 && strlen(pass) == 0)
 		return 0;
 
-	if (strcmp(crypt(pass, goodhash), goodhash) == 0)
+	c = crypt(pass, goodhash);
+	if (c == NULL)
+		goto fail;
+
+	if (strcmp(c, goodhash) == 0)
 		return 0;
 
 fail:

ef0f1f1c346efc1053d78e'>refs</a><a class='active' href='/guix/log/gnu/packages/nano.scm'>log</a><a href='/guix/tree/gnu/packages/nano.scm?id=df730f675753e0a892ef0f1f1c346efc1053d78e'>tree</a><a href='/guix/commit/gnu/packages/nano.scm?id=df730f675753e0a892ef0f1f1c346efc1053d78e'>commit</a><a href='/guix/diff/gnu/packages/nano.scm?id=df730f675753e0a892ef0f1f1c346efc1053d78e'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/nano.scm'>
<input type='hidden' name='id' value='df730f675753e0a892ef0f1f1c346efc1053d78e'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=df730f675753e0a892ef0f1f1c346efc1053d78e'>root</a>/<a href='/guix/log/gnu?id=df730f675753e0a892ef0f1f1c346efc1053d78e'>gnu</a>/<a href='/guix/log/gnu/packages?id=df730f675753e0a892ef0f1f1c346efc1053d78e'>packages</a>/<a href='/guix/log/gnu/packages/nano.scm?id=df730f675753e0a892ef0f1f1c346efc1053d78e'>nano.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/nano.scm?id=df730f675753e0a892ef0f1f1c346efc1053d78e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-11-14 21:05:30 +0100'>2018-11-14</span></td><td><a href='/guix/commit/gnu/packages/nano.scm?id=7939387da83437918b87d00b06b19b7c987ed171'>gnu: nano: Update to 3.2.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-09-24 00:33:59 +0200'>2018-09-24</span></td><td><a href='/guix/commit/gnu/packages/nano.scm?id=0604d3cfceea13fad33c6188fa54f5fd16c74406'>gnu: nano: Update to 3.1.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-09-10 13:54:29 -0400'>2018-09-10</span></td><td><a href='/guix/commit/gnu/packages/nano.scm?id=254844f22d81356ee00977e95640245281257661'>gnu: nano: Update to 3.0.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2018-06-05 03:18:46 +0200'>2018-06-05</span></td><td><a href='/guix/commit/gnu/packages/nano.scm?id=123f86d8989cc787cddeb2ffd3c3640e29d56c9d'>gnu: nano: Update to 2.9.8.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-05-15 22:24:07 -0500'>2018-05-15</span></td><td><a href='/guix/commit/gnu/packages/nano.scm?id=5f93600fa62d5fa1e47e273ec347ee14e72f7170'>gnu: nano: Update to 2.9.7.</a><span class='msg-avail'>...</span></td><td>Eric Bavier</td></tr>
<tr><td><span title='2018-05-01 16:01:39 +0200'>2018-05-01</span></td><td><a href='/guix/commit/gnu/packages/nano.scm?id=4336e36c943a31c7c02cc74cbb0212787c77e0f8'>gnu: nano: Update to 2.9.6.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-03-29 16:08:06 +0300'>2018-03-29</span></td><td><a href='/guix/commit/gnu/packages/nano.scm?id=594e5d73688bb75fe5efc6ae3c27b4689e16726d'>gnu: nano: Update to 2.9.5.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2018-03-08 20:29:20 +0200'>2018-03-08</span></td><td><a href='/guix/commit/gnu/packages/nano.scm?id=fee7f8a94ec64943109ba9c37f75c28749fb18bd'>gnu: nano: Update to 2.9.4.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>