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:

9683d2eafdbfc0caac96'>refs</a><a class='active' href='/guix/log/gnu/packages/efi.scm'>log</a><a href='/guix/tree/gnu/packages/efi.scm?id=897186c1554e18a187429683d2eafdbfc0caac96'>tree</a><a href='/guix/commit/gnu/packages/efi.scm?id=897186c1554e18a187429683d2eafdbfc0caac96'>commit</a><a href='/guix/diff/gnu/packages/efi.scm?id=897186c1554e18a187429683d2eafdbfc0caac96'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/efi.scm'>
<input type='hidden' name='id' value='897186c1554e18a187429683d2eafdbfc0caac96'/><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=897186c1554e18a187429683d2eafdbfc0caac96'>root</a>/<a href='/guix/log/gnu?id=897186c1554e18a187429683d2eafdbfc0caac96'>gnu</a>/<a href='/guix/log/gnu/packages?id=897186c1554e18a187429683d2eafdbfc0caac96'>packages</a>/<a href='/guix/log/gnu/packages/efi.scm?id=897186c1554e18a187429683d2eafdbfc0caac96'>efi.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/efi.scm?id=897186c1554e18a187429683d2eafdbfc0caac96&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-12-01 00:49:16 +0100'>2019-12-01</span></td><td><a href='/guix/commit/gnu/packages/efi.scm?id=93882a9cab18134284a2635c0418d9311251a087'>gnu: gnu-efi: Update to 3.0.11.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/efi.scm (gnu-efi): Update to 3.0.11.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-02-12 18:08:19 +0200'>2019-02-12</span></td><td><a href='/guix/commit/gnu/packages/efi.scm?id=b856a78c949543da2cb829b36cb96e74309e8d35'>gnu: efilinux: Set ARCH variable on some architectures.</a><span class='msg-avail'>...<span class='msg-tooltip'>Even with this patch efilinux does not build for arm*.

* gnu/packages/efi.scm (efilinux)[arguments]: On armhf-linux and
aarch64-linux set the ARCH variable apropriately.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2019-02-04 00:16:47 +0100'>2019-02-04</span></td><td><a href='/guix/commit/gnu/packages/efi.scm?id=c7797b75cc648489b811bc7b9485fb4e0cb79173'>gnu: efilinux: Fix indentation of source code.</a><span class='msg-avail'>...<span class='msg-tooltip'>Follow-up to 6adfcbeab1cbaf8ce6ff6f32aad5d72f94860cbb.

* gnu/packages/efi.scm (efilinux): Fix indentation of source code.
</span></span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2019-02-04 00:14:18 +0100'>2019-02-04</span></td><td><a href='/guix/commit/gnu/packages/efi.scm?id=bb4a8f4851c19a9d0a0ea55bab8aa802f09f6b6d'>gnu: Add efilinux.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/efi.scm (efilinux): New variable.
</span></span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2019-02-04 00:14:18 +0100'>2019-02-04</span></td><td><a href='/guix/commit/gnu/packages/efi.scm?id=527aab6f1813d7c2a92ef6b831fb77278aacdef5'>gnu: Add efitools.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/efi.scm (efitools): New variable.
</span></span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2019-02-04 00:14:18 +0100'>2019-02-04</span></td><td><a href='/guix/commit/gnu/packages/efi.scm?id=3da49652ad94298ff283e108562a0bfb4aea47ff'>gnu: Add sbsigntools.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/efi.scm (sbsigntools): New variable.
</span></span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2019-02-04 00:14:16 +0100'>2019-02-04</span></td><td><a href='/guix/commit/gnu/packages/efi.scm?id=f8ff37d6c093e7cab16d1987139b4df92a7ae4ab'>gnu: Add gnu-efi.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/efi.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
</span></span></td><td>Danny Milosavljevic</td></tr>