mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-16 23:19:31 +00:00
a457ca6636Closes: https://bugs.gentoo.org/871258 Closes: https://bugs.gentoo.org/874942 Signed-off-by: David Seifert <soap@gentoo.org>
34 lines
878 B
Diff
34 lines
878 B
Diff
--- a/src/shash.c
|
|
+++ b/src/shash.c
|
|
@@ -631,11 +631,11 @@
|
|
|
|
if (nosalt == FALSE && hmac == 1) {
|
|
if (sscanf
|
|
- (linebuf, "%s %s %s\n", hexbuffer, buffer,
|
|
- buffer2) < 2) {
|
|
+ (linebuf, "%s %s *%s\n", hexbuffer, buffer,
|
|
+ buffer2) != 3) {
|
|
if (sscanf
|
|
- (linebuf, "%s %s *%s\n", hexbuffer,
|
|
- buffer, buffer2) < 2)
|
|
+ (linebuf, "%s %s %s\n", hexbuffer,
|
|
+ buffer, buffer2) != 3)
|
|
continue;
|
|
}
|
|
|
|
@@ -648,11 +648,11 @@
|
|
key = pass2key(algorithm, keymode_buffer, &keylen, password, plen);
|
|
|
|
} else {
|
|
- if (sscanf(linebuf, "%s %s\n", buffer, buffer2) ==
|
|
- 0) {
|
|
+ if (sscanf(linebuf, "%s *%s\n", buffer, buffer2) !=
|
|
+ 2) {
|
|
if (sscanf
|
|
- (linebuf, "%s *%s\n", buffer,
|
|
- buffer2) == 0)
|
|
+ (linebuf, "%s %s\n", buffer,
|
|
+ buffer2) != 2)
|
|
continue;
|
|
}
|
|
|