git-cvsserver: protect against NULL in crypt(3)
Some versions of crypt(3) will return NULL when passed an unsupported hash type (ex: OpenBSD with DES), so check for undef instead of using it directly. Also use this to probe the system and select a better hash function in the tests, so it can pass successfully. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> [jc: <CAPUEspjqD5zy8TLuFA96usU7FYi=0wF84y7NgOVFqegtxL9zbw@mail.gmail.com>] Signed-off-by: Junio C Hamano <gitster@pobox.com>
Carlo Marcelo Arenas Belón committed
Sep 15, 2021 at 01:09 UTC
bffcb4d9d6394a68a7f6c03598087705c6d34510
2 files changed
+9
-3
git-cvsserver.perl
+3
-2
@@ -222,10 +222,11 @@ if ($state->{method} eq 'pserver') {
222
open my $passwd, "<", $authdb or die $!;
223
while (<$passwd>) {
224
if (m{^\Q$user\E:(.*)}) {
225
- if (crypt(descramble($password), $1) eq $1) {
225
+ my $hash = crypt(descramble($password), $1);
226
+ if (defined $hash and $hash eq $1) {
227
$auth_ok = 1;
228
}
228
- };
229
+ }
230
}
231
close $passwd;
232
t/t9400-git-cvsserver-server.sh
+6
-1
@@ -36,7 +36,12 @@ CVSWORK="$PWD/cvswork"
36
CVS_SERVER=git-cvsserver
37
export CVSROOT CVS_SERVER
38
39
-PWDHASH='lac2ItudM3.KM'
39
+if perl -e 'exit(1) if not defined crypt("", "cv")'
40
+then
41
+ PWDHASH='lac2ItudM3.KM'
42
+else
43
+ PWDHASH='$2b$10$t8fGvE/a9eLmfOLzsZme2uOa2QtoMYwIxq9wZA6aBKtF1Yb7FJIzi'
44
+fi
45
46
rm -rf "$CVSWORK" "$SERVERDIR"
47
test_expect_success 'setup' '