Imported Upstream version 1.6.7

[platform/upstream/cryptsetup.git] / lib / utils_crypt.h

diff --git a/lib/utils_crypt.h b/lib/utils_crypt.h
index 1b22b14..3da4842 100644 (file)
--- a/lib/utils_crypt.h
+++ b/lib/utils_crypt.h
@@ -3,10 +3,12 @@
  *
  * Copyright (C) 2004-2007, Clemens Fruhwirth <clemens@endorphin.org>
  * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2009-2012, Milan Broz
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,10 +24,10 @@
 #define _UTILS_CRYPT_H
 
 #include <unistd.h>
-#include "config.h"
 
 #define MAX_CIPHER_LEN         32
-#define MAX_CIPHER_LEN_STR     "32"
+#define MAX_CIPHER_LEN_STR     "31"
+#define MAX_KEYFILES           32
 
 struct crypt_device;
 
@@ -43,4 +45,9 @@ void *crypt_safe_alloc(size_t size);
 void crypt_safe_free(void *data);
 void *crypt_safe_realloc(void *data, size_t size);
 
+void crypt_memzero(void *s, size_t n);
+
+ssize_t crypt_hex_to_bytes(const char *hex, char **result, int safe_alloc);
+int crypt_string_to_size(struct crypt_device *cd, const char *s, uint64_t *size);
+
 #endif /* _UTILS_CRYPT_H */