projects
/
platform
/
upstream
/
cryptsetup.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add copyright line for files I have written or modified.
[platform/upstream/cryptsetup.git]
/
lib
/
crypt_plain.c
diff --git
a/lib/crypt_plain.c
b/lib/crypt_plain.c
index
c6d1b1d
..
dbbbbee
100644
(file)
--- a/
lib/crypt_plain.c
+++ b/
lib/crypt_plain.c
@@
-2,7
+2,8
@@
* cryptsetup plain device helper functions
*
* Copyright (C) 2004, Christophe Saout <christophe@saout.de>
* cryptsetup plain device helper functions
*
* Copyright (C) 2004, Christophe Saout <christophe@saout.de>
- * Copyright (C) 2010-2011 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2010-2012 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2010-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
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@
-15,15
+16,15
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* 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., 5
9 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <string.h>
#include <stdlib.h>
#include <errno.h>
*/
#include <string.h>
#include <stdlib.h>
#include <errno.h>
+#include "libcryptsetup.h"
#include "internal.h"
#include "internal.h"
-#include "crypto_backend.h"
static int hash(const char *hash_name, size_t key_size, char *key,
size_t passphrase_size, const char *passphrase)
static int hash(const char *hash_name, size_t key_size, char *key,
size_t passphrase_size, const char *passphrase)
@@
-54,8
+55,6
@@
static int hash(const char *hash_name, size_t key_size, char *key,
key += len;
key_size -= len;
key += len;
key_size -= len;
- if (key_size && crypt_hash_restart(md))
- r = 1;
}
crypt_hash_destroy(md);
}
crypt_hash_destroy(md);