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:

2d6ad7908478bbe64c3d3c'>refs</a><a class='active' href='/guix/log/build-aux/test-env.in'>log</a><a href='/guix/tree/build-aux/test-env.in?id=affd215764d0b7a9aa2d6ad7908478bbe64c3d3c'>tree</a><a href='/guix/commit/build-aux/test-env.in?id=affd215764d0b7a9aa2d6ad7908478bbe64c3d3c'>commit</a><a href='/guix/diff/build-aux/test-env.in?id=affd215764d0b7a9aa2d6ad7908478bbe64c3d3c'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/build-aux/test-env.in'>
<input type='hidden' name='id' value='affd215764d0b7a9aa2d6ad7908478bbe64c3d3c'/><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=affd215764d0b7a9aa2d6ad7908478bbe64c3d3c'>root</a>/<a href='/guix/log/build-aux?id=affd215764d0b7a9aa2d6ad7908478bbe64c3d3c'>build-aux</a>/<a href='/guix/log/build-aux/test-env.in?id=affd215764d0b7a9aa2d6ad7908478bbe64c3d3c'>test-env.in</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/build-aux/test-env.in?id=affd215764d0b7a9aa2d6ad7908478bbe64c3d3c&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-12-22 10:53:19 +0100'>2021-12-22</span></td><td><a href='/guix/commit/build-aux/test-env.in?id=9ebc9ca070a21ba0aeb3f61202a8071bb250ccc8'>tests: Move keys into ./tests/keys/ and add a third ed25519 key.</a><span class='msg-avail'>...<span class='msg-tooltip'>The third key will be used in an upcoming commit.

Rename public keys to .pub.

* guix/tests/gnupg.scm (%ed25519-3-public-key-file): New variable.
(%ed25519-3-secret-key-file): New variable.
(%ed25519-2-public-key-file): Renamed from %ed25519bis-public-key-file.
(%ed25519-2-secret-key-file): Renamed from %ed25519bis-secret-key-file.
* tests/keys/ed25519-3.key: New file.
* tests/keys/ed25519-3.sec: New file.

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;
</span></span></td><td>Attila Lendvai</td></tr>
<tr><td><span title='2021-04-20 12:13:16 +0200'>2021-04-20</span></td><td><a href='/guix/commit/build-aux/test-env.in?id=d95168321f4a9bf6857b598da0a183b45a868d54'>import: Remove Nix importer.</a><span class='msg-avail'>...<span class='msg-tooltip'>This importer has suffered from bitrot and no longer works with current
Nix and Nixpkgs.  See &lt;https://bugs.gnu.org/32339&gt; and
&lt;https://bugs.gnu.org/36255&gt;.

* guix/import/snix.scm, guix/scripts/import/nix.scm,
tests/snix.scm: Remove.
* Makefile.am (MODULES, SCM_TESTS): Remove them.
* guix/scripts/import.scm (importers): Remove "nix".
* build-aux/test-env.in: Remove NIXPKGS variable.
* configure.ac: Remove '--with-nixpkgs' option.
* doc/guix.texi (Invoking guix import): Remove bit about "guix import
nix".
* etc/completion/fish/guix.fish: Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>