Use proper path prefix macros in spec

[platform/upstream/cryptsetup.git] / lib / volumekey.c

diff --git a/lib/volumekey.c b/lib/volumekey.c
index 5dec0bf..e7150aa 100644 (file)
--- a/lib/volumekey.c
+++ b/lib/volumekey.c
@@ -2,11 +2,12 @@
  * cryptsetup volume key implementation
  *
  * Copyright (C) 2004-2006, Clemens Fruhwirth <clemens@endorphin.org>
- * Copyright (C) 2010 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2010-2012, Red Hat, Inc. All rights reserved.
  *
  * 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
@@ -15,7 +16,7 @@
  *
  * 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 <string.h>
@@ -23,8 +24,6 @@
 
 #include "internal.h"
 
-int getRandom(char *buf, size_t len);
-
 struct volume_key *crypt_alloc_volume_key(unsigned keylength, const char *key)
 {
        struct volume_key *vk = malloc(sizeof(*vk) + keylength);
@@ -35,6 +34,8 @@ struct volume_key *crypt_alloc_volume_key(unsigned keylength, const char *key)
        vk->keylength = keylength;
        if (key)
                memcpy(&vk->key, key, keylength);
+       else
+               crypt_memzero(&vk->key, keylength);
 
        return vk;
 }
@@ -42,13 +43,13 @@ struct volume_key *crypt_alloc_volume_key(unsigned keylength, const char *key)
 void crypt_free_volume_key(struct volume_key *vk)
 {
        if (vk) {
-               memset(vk->key, 0, vk->keylength);
+               crypt_memzero(vk->key, vk->keylength);
                vk->keylength = 0;
                free(vk);
        }
 }
 
-struct volume_key *crypt_generate_volume_key(unsigned keylength)
+struct volume_key *crypt_generate_volume_key(struct crypt_device *cd, unsigned keylength)
 {
        int r;
        struct volume_key *vk;
@@ -57,11 +58,10 @@ struct volume_key *crypt_generate_volume_key(unsigned keylength)
        if (!vk)
                return NULL;
 
-       r = getRandom(vk->key, keylength);
+       r = crypt_random_get(cd, vk->key, keylength, CRYPT_RND_KEY);
        if(r < 0) {
                crypt_free_volume_key(vk);
                return NULL;
        }
        return vk;
 }
-