|
 |
b5a5d8 |
diff -up gnupg-2.1.1/g10/mainproc.c.fips gnupg-2.1.1/g10/mainproc.c
|
|
|
b5a5d8 |
--- gnupg-2.1.1/g10/mainproc.c.fips 2015-01-29 17:19:49.266031504 +0100
|
|
|
b5a5d8 |
+++ gnupg-2.1.1/g10/mainproc.c 2015-01-29 17:27:13.938088122 +0100
|
|
|
b5a5d8 |
@@ -719,7 +719,8 @@ proc_plaintext( CTX c, PACKET *pkt )
|
|
|
b5a5d8 |
according to 2440, so hopefully it won't come up that often.
|
|
|
b5a5d8 |
There is no good way to specify what algorithms to use in
|
|
|
b5a5d8 |
that case, so these there are the historical answer. */
|
|
|
b5a5d8 |
- gcry_md_enable (c->mfx.md, DIGEST_ALGO_RMD160);
|
|
|
b5a5d8 |
+ if (!gcry_fips_mode_active())
|
|
|
b5a5d8 |
+ gcry_md_enable (c->mfx.md, DIGEST_ALGO_RMD160);
|
|
|
b5a5d8 |
gcry_md_enable (c->mfx.md, DIGEST_ALGO_SHA1);
|
|
|
b5a5d8 |
}
|
|
|
b5a5d8 |
if (DBG_HASHING)
|
|
|
b5a5d8 |
diff --git a/common/t-sexputil.c b/common/t-sexputil.c
|
|
|
b5a5d8 |
index d75090c5b..be5eb2122 100644
|
|
|
b5a5d8 |
--- a/common/t-sexputil.c
|
|
|
b5a5d8 |
+++ b/common/t-sexputil.c
|
|
|
b5a5d8 |
@@ -291,36 +291,6 @@ test_ecc_uncompress (void)
|
|
|
b5a5d8 |
const char *b; /* Compressed. */
|
|
|
b5a5d8 |
}
|
|
|
b5a5d8 |
tests[] = {
|
|
|
b5a5d8 |
- {
|
|
|
b5a5d8 |
- "(public-key"
|
|
|
b5a5d8 |
- " (ecc"
|
|
|
b5a5d8 |
- " (curve brainpoolP256r1)"
|
|
|
b5a5d8 |
- " (q #042ECD8679930BE2DB4AD42B8600BA3F80"
|
|
|
b5a5d8 |
- /* */"2D4D539BFF2F69B83EC9B7BBAA7F3406"
|
|
|
b5a5d8 |
- /* */"436DD11A1756AFE56CD93408410FCDA9"
|
|
|
b5a5d8 |
- /* */"BA95024EB613BD481A14FCFEC27A448A#)))",
|
|
|
b5a5d8 |
- /* The same in compressed form. */
|
|
|
b5a5d8 |
- "(public-key"
|
|
|
b5a5d8 |
- " (ecc"
|
|
|
b5a5d8 |
- " (curve brainpoolP256r1)"
|
|
|
b5a5d8 |
- " (q #022ECD8679930BE2DB4AD42B8600BA3F80"
|
|
|
b5a5d8 |
- /* */"2D4D539BFF2F69B83EC9B7BBAA7F3406#)))"
|
|
|
b5a5d8 |
- },
|
|
|
b5a5d8 |
- {
|
|
|
b5a5d8 |
- "(public-key"
|
|
|
b5a5d8 |
- " (ecc"
|
|
|
b5a5d8 |
- " (curve brainpoolP256r1)"
|
|
|
b5a5d8 |
- " (q #045B784CA008EE64AB3D85017EE0D2BE87"
|
|
|
b5a5d8 |
- /* */"558762C7300E0C8E06B1F9AF7C031458"
|
|
|
b5a5d8 |
- /* */"9EBBA41915313417BA54218EB0569C59"
|
|
|
b5a5d8 |
- /* */"0B156C76DBCAB6E84575E6EF68CE7B87#)))",
|
|
|
b5a5d8 |
- /* The same in compressed form. */
|
|
|
b5a5d8 |
- "(public-key"
|
|
|
b5a5d8 |
- " (ecc"
|
|
|
b5a5d8 |
- " (curve brainpoolP256r1)"
|
|
|
b5a5d8 |
- " (q #035B784CA008EE64AB3D85017EE0D2BE87"
|
|
|
b5a5d8 |
- /* */"558762C7300E0C8E06B1F9AF7C031458#)))"
|
|
|
b5a5d8 |
- },
|
|
|
b5a5d8 |
{ /* A key which does not require a conversion. */
|
|
|
b5a5d8 |
"(public-key"
|
|
|
b5a5d8 |
" (ecdsa"
|