X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/812b526d127c6657e571db8b33a58137af6709cd..3fc75114f93094024e457141d8e67cda38b87e9b:/lib/authhash.c

diff --git a/lib/authhash.c b/lib/authhash.c
index d5da9c5..78352da 100644
--- a/lib/authhash.c
+++ b/lib/authhash.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2004, 2006, 2007 Richard Kettlewell
+ * Copyright (C) 2004, 2006, 2007, 2009, 2013 Richard Kettlewell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,11 @@
 #include "common.h"
 
 #include <stddef.h>
-#include <gcrypt.h>
+#if HAVE_GCRYPT_H
+# include <gcrypt.h>
+#else
+# error No crypto API available
+#endif
 
 #include "hex.h"
 #include "log.h"
@@ -31,8 +35,11 @@ struct algorithm {
   /** @brief DisOrder algorithm name */
   const char *name;
 
+#if HAVE_GCRYPT_H
   /** @brief gcrypt algorithm ID */
   int id;
+#endif
+
 };
 
 /** @brief Algorithm lookup table
@@ -41,6 +48,7 @@ struct algorithm {
  * the disorder protocol.
  */
 static const struct algorithm algorithms[] = {
+#if HAVE_GCRYPT_H
   { "SHA1", GCRY_MD_SHA1 },
   { "sha1", GCRY_MD_SHA1 },
   { "SHA256", GCRY_MD_SHA256 },
@@ -49,6 +57,7 @@ static const struct algorithm algorithms[] = {
   { "sha384", GCRY_MD_SHA384 },
   { "SHA512", GCRY_MD_SHA512 },
   { "sha512", GCRY_MD_SHA512 },
+#endif
 };
 
 /** @brief Number of supported algorithms */
@@ -64,12 +73,14 @@ static const struct algorithm algorithms[] = {
  * Computes H(challenge|password) and returns it as a newly allocated hex
  * string, or returns NULL on error.
  */
-const char *authhash(const void *challenge, size_t nchallenge,
-		     const char *password, const char *algo) {
+char *authhash(const void *challenge, size_t nchallenge,
+               const char *password, const char *algo) {
+#if HAVE_GCRYPT_H
   gcrypt_hash_handle h;
-  const char *res;
-  size_t n;
   int id;
+#endif
+  char *res;
+  size_t n;
 
   assert(challenge != 0);
   assert(password != 0);
@@ -79,13 +90,14 @@ const char *authhash(const void *challenge, size_t nchallenge,
       break;
   if(n >= NALGORITHMS)
     return NULL;
+#if HAVE_GCRYPT_H
   id = algorithms[n].id;
 #if HAVE_GCRY_ERROR_T
   {
     gcry_error_t e;
     
     if((e = gcry_md_open(&h, id, 0))) {
-      error(0, "gcry_md_open: %s", gcry_strerror(e));
+      disorder_error(0, "gcry_md_open: %s", gcry_strerror(e));
       return 0;
     }
   }
@@ -96,6 +108,7 @@ const char *authhash(const void *challenge, size_t nchallenge,
   gcry_md_write(h, challenge, nchallenge);
   res = hex(gcry_md_read(h, id), gcry_md_get_algo_dlen(id));
   gcry_md_close(h);
+#endif
   return res;
 }