Add provisory support for RDRAND instruction.

diff --git a/crypto/engine/Makefile b/crypto/engine/Makefile
index e563ecaf836a8fc151d894494f0a73fa88ddec9e..6f7b29f9a265887eed136d3603c668b921b74d7b 100644 (file)
--- a/crypto/engine/Makefile
+++ b/crypto/engine/Makefile
@@ -22,13 +22,13 @@ LIBSRC= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \
        tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \
        tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c \
        eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c \
-       eng_aesni.c eng_rsax.c
+       eng_aesni.c eng_rsax.c eng_rdrand.c
 LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \
        eng_table.o eng_pkey.o eng_fat.o eng_all.o \
        tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \
        tb_cipher.o tb_digest.o tb_pkmeth.o tb_asnmth.o \
        eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o \
-       eng_aesni.o eng_rsax.o
+       eng_aesni.o eng_rsax.o eng_rdrand.o
 
 SRC= $(LIBSRC)
 

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index b0a416d2fef4f851faf646ffaad0d26441d9f6c6..81bc5ff93395395b3b6e5f40cdf38e77cc4f7cc1 100644 (file)
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -78,6 +78,9 @@ void ENGINE_load_builtin_engines(void)
 #endif
 #ifndef OPENSSL_NO_RSAX
        ENGINE_load_rsax();
+#endif
+#ifndef OPENSSL_NO_RDRAND
+       ENGINE_load_rdrand();
 #endif
        ENGINE_load_dynamic();
 #ifndef OPENSSL_NO_STATIC_ENGINE

diff --git a/crypto/engine/eng_rdrand.c b/crypto/engine/eng_rdrand.c
new file mode 100644 (file)
index 0000000..26507c5
--- /dev/null
+++ b/crypto/engine/eng_rdrand.c
@@ -0,0 +1,140 @@
+/* ====================================================================
+ * Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include <openssl/opensslconf.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <openssl/engine.h>
+
+#if (defined(__i386)   || defined(__i386__)   || defined(_M_IX86) || \
+     defined(__x86_64) || defined(__x86_64__) || \
+     defined(_M_AMD64) || defined (_M_X64)) && !defined(OPENSSL_NO_ASM)
+
+size_t OPENSSL_ia32_rdrand(void);
+
+static int get_random_bytes (unsigned char *buf, size_t num)
+       {
+       size_t rnd;
+
+       while (num>=sizeof(size_t)) {
+               if ((rnd = OPENSSL_ia32_rdrand()) == 0) return 0;
+
+               *((size_t *)buf) = rnd;
+               buf += sizeof(size_t);
+               num -= sizeof(size_t);
+       }
+       if (num) {
+               if ((rnd = OPENSSL_ia32_rdrand()) == 0) return 0;
+
+               memcpy (buf,&rnd,num);
+       }
+
+       return 1;
+       }
+
+static int random_status (void)
+{      return 1;       }
+
+static RAND_METHOD rdrand_meth =
+       {
+       NULL,   /* seed */
+       get_random_bytes,
+       NULL,   /* cleanup */
+       NULL,   /* add */
+       get_random_bytes,
+       random_status,
+       };
+
+static int rdrand_init(ENGINE *e)
+{      return 1;       }
+
+static const char *engine_e_rdrand_id = "rdrand";
+static const char *engine_e_rdrand_name = "Intel RDRAND engine";
+
+static int bind_helper(ENGINE *e)
+       {
+       if (!ENGINE_set_id(e, engine_e_rdrand_id) ||
+           !ENGINE_set_name(e, engine_e_rdrand_name) ||
+           !ENGINE_set_init_function(e, rdrand_init) ||
+           !ENGINE_set_RAND(e, &rdrand_meth) )
+               return 0;
+
+       return 1;
+       }
+
+static ENGINE *ENGINE_rdrand(void)
+       {
+       ENGINE *ret = ENGINE_new();
+       if(!ret)
+               return NULL;
+       if(!bind_helper(ret))
+               {
+               ENGINE_free(ret);
+               return NULL;
+               }
+       return ret;
+       }
+
+void ENGINE_load_rdrand (void)
+       {
+       extern OPENSSL_ia32cap_P[];
+
+       if (OPENSSL_ia32cap_P[1] & (1<<(62-32)))
+               {
+               ENGINE *toadd = ENGINE_rdrand();
+               if(!toadd) return;
+               ENGINE_add(toadd);
+               ENGINE_free(toadd);
+               ERR_clear_error();
+               }
+       }
+#else
+void ENGINE_load_rdrand (void) {}
+#endif

diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index b9eb5d1bfe31bd95bfb95213cac8df8230865b6c..8a20ffc0a75fa97fd8ca46fab741c6723b813400 100644 (file)
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -353,6 +353,7 @@ void ENGINE_load_gost(void);
 void ENGINE_load_cryptodev(void);
 void ENGINE_load_aesni(void);
 void ENGINE_load_rsax(void);
+void ENGINE_load_rdrand(void);
 void ENGINE_load_builtin_engines(void);
 
 /* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation