X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=sigcheck.c;h=0bf6ae1e7eeb005499c3e47cec404702e4cbd830;hb=4b6032dbfb20e041043cfa0b6b84145f49a98a11;hp=d0ca3d1965e8a8c8fa3f2254d0b8f5ea3f8364ef;hpb=ec38d8bd7e8a66645e75e3d6c8b9dadb5dd85ec7;p=onak.git
diff --git a/sigcheck.c b/sigcheck.c
index d0ca3d1..0bf6ae1 100644
--- a/sigcheck.c
+++ b/sigcheck.c
@@ -13,13 +13,12 @@
* more details.
*
* You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program. If not, see .
*/
#include
-#include "config.h"
+#include "build-config.h"
#include "decodekey.h"
#include "keyid.h"
#include "keystructs.h"
@@ -47,19 +46,11 @@ int check_packet_sighash(struct openpgp_publickey *key,
struct sha1_ctx sha1_context;
struct sha1x_ctx sha1x_context;
struct md5_ctx md5_context;
-#ifdef NETTLE_WITH_RIPEMD160
+#ifdef HAVE_NETTLE
struct ripemd160_ctx ripemd160_context;
-#endif
-#ifdef NETTLE_WITH_SHA224
struct sha224_ctx sha224_context;
-#endif
-#ifdef NETTLE_WITH_SHA256
struct sha256_ctx sha256_context;
-#endif
-#ifdef NETTLE_WITH_SHA384
struct sha384_ctx sha384_context;
-#endif
-#ifdef NETTLE_WITH_SHA512
struct sha512_ctx sha512_context;
#endif
uint8_t keyheader[3];
@@ -213,8 +204,15 @@ int check_packet_sighash(struct openpgp_publickey *key,
}
sha1_digest(&sha1_context, 20, hash);
break;
+ case OPENPGP_HASH_SHA1X:
+ sha1x_init(&sha1x_context);
+ for (i = 0; i < chunks; i++) {
+ sha1x_update(&sha1x_context, hashlen[i], hashdata[i]);
+ }
+ sha1x_digest(&sha1x_context, 20, hash);
+ break;
+#ifdef HAVE_NETTLE
case OPENPGP_HASH_RIPEMD160:
-#ifdef NETTLE_WITH_RIPEMD160
ripemd160_init(&ripemd160_context);
for (i = 0; i < chunks; i++) {
ripemd160_update(&ripemd160_context, hashlen[i],
@@ -223,19 +221,7 @@ int check_packet_sighash(struct openpgp_publickey *key,
ripemd160_digest(&ripemd160_context, RIPEMD160_DIGEST_SIZE,
hash);
break;
-#else
- logthing(LOGTHING_INFO, "RIPEMD160 support not available.");
- return -1;
-#endif
- case OPENPGP_HASH_SHA1X:
- sha1x_init(&sha1x_context);
- for (i = 0; i < chunks; i++) {
- sha1x_update(&sha1x_context, hashlen[i], hashdata[i]);
- }
- sha1x_digest(&sha1x_context, 20, hash);
- break;
case OPENPGP_HASH_SHA224:
-#ifdef NETTLE_WITH_SHA224
sha224_init(&sha224_context);
for (i = 0; i < chunks; i++) {
sha224_update(&sha224_context, hashlen[i],
@@ -243,12 +229,7 @@ int check_packet_sighash(struct openpgp_publickey *key,
}
sha224_digest(&sha224_context, SHA224_DIGEST_SIZE, hash);
break;
-#else
- logthing(LOGTHING_INFO, "SHA224 support not available.");
- return -1;
-#endif
case OPENPGP_HASH_SHA256:
-#ifdef NETTLE_WITH_SHA256
sha256_init(&sha256_context);
for (i = 0; i < chunks; i++) {
sha256_update(&sha256_context, hashlen[i],
@@ -256,12 +237,7 @@ int check_packet_sighash(struct openpgp_publickey *key,
}
sha256_digest(&sha256_context, SHA256_DIGEST_SIZE, hash);
break;
-#else
- logthing(LOGTHING_INFO, "SHA256 support not available.");
- return -1;
-#endif
case OPENPGP_HASH_SHA384:
-#ifdef NETTLE_WITH_SHA384
sha384_init(&sha384_context);
for (i = 0; i < chunks; i++) {
sha384_update(&sha384_context, hashlen[i],
@@ -269,12 +245,7 @@ int check_packet_sighash(struct openpgp_publickey *key,
}
sha384_digest(&sha384_context, SHA384_DIGEST_SIZE, hash);
break;
-#else
- logthing(LOGTHING_INFO, "SHA384 support not available.");
- return -1;
-#endif
case OPENPGP_HASH_SHA512:
-#ifdef NETTLE_WITH_SHA512
sha512_init(&sha512_context);
for (i = 0; i < chunks; i++) {
sha512_update(&sha512_context, hashlen[i],
@@ -282,9 +253,6 @@ int check_packet_sighash(struct openpgp_publickey *key,
}
sha512_digest(&sha512_context, SHA512_DIGEST_SIZE, hash);
break;
-#else
- logthing(LOGTHING_INFO, "SHA512 support not available.");
- return -1;
#endif
default:
get_keyid(key, &keyid);