Fix missing headers

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

diff --git a/lib/random.c b/lib/random.c
index a0c693d..25c8a2c 100644 (file)
--- a/lib/random.c
+++ b/lib/random.c
@@ -1,11 +1,12 @@
 /*
  * cryptsetup kernel RNG access functions
  *
- * Copyright (C) 2010-2011, 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
@@ -14,7 +15,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 <stdlib.h>
@@ -22,6 +23,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <assert.h>
+#include <sys/select.h>
 
 #include "libcryptsetup.h"
 #include "internal.h"
@@ -176,7 +178,17 @@ int crypt_random_get(struct crypt_device *ctx, char *buf, size_t len, int qualit
        case CRYPT_RND_NORMAL:
                status = _get_urandom(ctx, buf, len);
                break;
+       case CRYPT_RND_SALT:
+               if (crypt_fips_mode())
+                       status = crypt_backend_rng(buf, len, quality, 1);
+               else
+                       status = _get_urandom(ctx, buf, len);
+               break;
        case CRYPT_RND_KEY:
+               if (crypt_fips_mode()) {
+                       status = crypt_backend_rng(buf, len, quality, 1);
+                       break;
+               }
                rng_type = ctx ? crypt_get_rng_type(ctx) :
                                 crypt_random_default_key_rng();
                switch (rng_type) {