chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log: more general error message formatting
[disorder]
/
lib
/
authhash.c
diff --git
a/lib/authhash.c
b/lib/authhash.c
index 8cc96f904542949d984c5104efe83be04040ff42..78352da3729dcd066ce2c957cad24bfaf3ffdde1 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, 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
*
* 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 "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"
#include "hex.h"
#include "log.h"
@@
-31,8
+35,11
@@
struct algorithm {
/** @brief DisOrder algorithm name */
const char *name;
/** @brief DisOrder algorithm name */
const char *name;
+#if HAVE_GCRYPT_H
/** @brief gcrypt algorithm ID */
int id;
/** @brief gcrypt algorithm ID */
int id;
+#endif
+
};
/** @brief Algorithm lookup table
};
/** @brief Algorithm lookup table
@@
-41,6
+48,7
@@
struct algorithm {
* the disorder protocol.
*/
static const struct algorithm algorithms[] = {
* the disorder protocol.
*/
static const struct algorithm algorithms[] = {
+#if HAVE_GCRYPT_H
{ "SHA1", GCRY_MD_SHA1 },
{ "sha1", GCRY_MD_SHA1 },
{ "SHA256", GCRY_MD_SHA256 },
{ "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 },
{ "sha384", GCRY_MD_SHA384 },
{ "SHA512", GCRY_MD_SHA512 },
{ "sha512", GCRY_MD_SHA512 },
+#endif
};
/** @brief Number of supported algorithms */
};
/** @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.
*/
* 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;
gcrypt_hash_handle h;
- const char *res;
- size_t n;
int id;
int id;
+#endif
+ char *res;
+ size_t n;
assert(challenge != 0);
assert(password != 0);
assert(challenge != 0);
assert(password != 0);
@@
-79,6
+90,7
@@
const char *authhash(const void *challenge, size_t nchallenge,
break;
if(n >= NALGORITHMS)
return NULL;
break;
if(n >= NALGORITHMS)
return NULL;
+#if HAVE_GCRYPT_H
id = algorithms[n].id;
#if HAVE_GCRY_ERROR_T
{
id = algorithms[n].id;
#if HAVE_GCRY_ERROR_T
{
@@
-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);
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;
}
return res;
}