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 7c2bd76..3da4842 100644 (file)
--- a/lib/utils_crypt.h
+++ b/lib/utils_crypt.h
@@ -1,21 +1,53 @@
+/*
+ * utils_crypt - cipher utilities for cryptsetup
+ *
+ * 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
+ * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for 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.
+ */
+
 #ifndef _UTILS_CRYPT_H
 #define _UTILS_CRYPT_H
 
-#define MAX_CIPHER_LEN         32
-#define MAX_CIPHER_LEN_STR     "32"
+#include <unistd.h>
 
-#define MAX_TTY_PASSWORD_LEN   512
+#define MAX_CIPHER_LEN         32
+#define MAX_CIPHER_LEN_STR     "31"
+#define MAX_KEYFILES           32
 
 struct crypt_device;
 
-int crypt_parse_name_and_mode(const char *s, char *cipher, char *cipher_mode);
+int crypt_parse_name_and_mode(const char *s, char *cipher,
+                             int *key_nums, char *cipher_mode);
 
-void crypt_get_key(char *prompt, char **key, unsigned int *passLen, int key_size,
-                  const char *key_file, int timeout, int how2verify,
-                  struct crypt_device *cd);
+int crypt_get_key(const char *prompt,
+                 char **key, size_t *key_size,
+                 size_t keyfile_offset, size_t keyfile_size_max,
+                 const char *key_file,
+                 int timeout, int verify,
+                 struct crypt_device *cd);
 
 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 */