Merge tag 'branchpoint-5.1' into release

[disorder] / lib / authhash.c

diff --git a/lib/authhash.c b/lib/authhash.c
index 9d36fefd40124264b27a60b4dcb5263e6916f683..c06c233ed26642833a92517ce9ae425a93ba758e 100644 (file)
--- a/lib/authhash.c
+++ b/lib/authhash.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
 /*
  * This file is part of DisOrder

- * Copyright (C) 2004, 2006, 2007 Richard Kettlewell
+ * Copyright (C) 2004, 2006, 2007, 2009 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
  *
  * 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


@@ -28,7 +28,10 @@
 
 /** @brief Structure of algorithm lookup table */
 struct algorithm {
 
 /** @brief Structure of algorithm lookup table */
 struct algorithm {

+  /** @brief DisOrder algorithm name */

   const char *name;
   const char *name;

+
+  /** @brief gcrypt algorithm ID */

   int id;
 };
 
   int id;
 };
 


@@ -56,14 +59,15 @@ static const struct algorithm algorithms[] = {
  * @param nchallenge Size of challenge
  * @param password Password
  * @param algo Algorithm to use
  * @param nchallenge Size of challenge
  * @param password Password
  * @param algo Algorithm to use

+ * @return Hex string or NULL on error

  *
  * Computes H(challenge|password) and returns it as a newly allocated hex
  * string, or returns NULL on error.
  */
  *
  * 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) {

   gcrypt_hash_handle h;
   gcrypt_hash_handle h;

-  const char *res;
+  char *res;

   size_t n;
   int id;
 
   size_t n;
   int id;
 


@@ -81,7 +85,7 @@ const char *authhash(const void *challenge, size_t nchallenge,
     gcry_error_t e;
     
     if((e = gcry_md_open(&h, id, 0))) {
     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;
     }
   }
       return 0;
     }
   }