security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

tests: Fix common/t-ssh-utils.

Browse Source 
* common/t-ssh-utils.c (main): Accept an error with MD5 in_fips_mode.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-04-14 11:39:30 +09:00
parent 1f0651dbfb
commit 5e508ffcab
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/t-ssh-utils.c
View File

@ -276,7 +276,7 @@ main (int argc, char **argv)
int in_fips_mode = 0; int in_fips_mode = 0;
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
if (gcry_fips_mode_active()) if (gcry_fips_mode_active ())
in_fips_mode = 1; in_fips_mode = 1;
/* --dump-keys dumps the keys as KEYGRIP.key.IDX. Useful to compute /* --dump-keys dumps the keys as KEYGRIP.key.IDX. Useful to compute
@ -327,13 +327,17 @@ main (int argc, char **argv)
xfree (string); xfree (string);
err = ssh_get_fingerprint_string (key, GCRY_MD_MD5, &string); err = ssh_get_fingerprint_string (key, GCRY_MD_MD5, &string);
if (in_fips_mode && !err) if (in_fips_mode)
{ {
fprintf (stderr, "%s:%d: Getting MD5 fingerprint unexpectedly " if (!err)
"worked in FIPS mode\n", __FILE__, __LINE__); {
exit (1); fprintf (stderr, "%s:%d: Getting MD5 fingerprint unexpectedly "
"worked in FIPS mode\n", __FILE__, __LINE__);
exit (1);
}
continue;
} }
else if (err) if (err)
{ {
fprintf (stderr, "%s:%d: error getting fingerprint: %s\n", fprintf (stderr, "%s:%d: error getting fingerprint: %s\n",
__FILE__, __LINE__, gpg_strerror (err)); __FILE__, __LINE__, gpg_strerror (err));