X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=lib%2Fcrypt_plain.c;h=dbbbbeef937c00e41c1b17accbc0f1e0c55e363f;hb=83f02e66827fa6fa66f9b73a009d2ba51d22352d;hp=c6d1b1dc235452634102615031d889bf5a16d4eb;hpb=5d2205a2f8a0e22d650a7bdb3ef73d7cdc15eef3;p=platform%2Fupstream%2Fcryptsetup.git diff --git a/lib/crypt_plain.c b/lib/crypt_plain.c index c6d1b1d..dbbbbee 100644 --- a/lib/crypt_plain.c +++ b/lib/crypt_plain.c @@ -2,7 +2,8 @@ * cryptsetup plain device helper functions * * Copyright (C) 2004, Christophe Saout - * 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 @@ -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 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include #include #include +#include "libcryptsetup.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) @@ -54,8 +55,6 @@ static int hash(const char *hash_name, size_t key_size, char *key, key += len; key_size -= len; - if (key_size && crypt_hash_restart(md)) - r = 1; } crypt_hash_destroy(md);