generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RAND library FIPS merge.

Browse Source
This commit is contained in:
Dr. Stephen Henson
2008-09-16 11:50:05 +00:00
parent fced277486
commit f4179bead4
6 changed files with 142 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
crypto/rand/rand_lib.c
View File

@@ -60,15 +60,82 @@
#include <time.h>
#include "cryptlib.h"
#include <openssl/rand.h>
#include "rand_lcl.h"
#ifdef OPENSSL_FIPS
#include <openssl/fips.h>
#include <openssl/fips_rand.h>
#endif
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
#endif
static const RAND_METHOD *default_RAND_meth = NULL;
#ifdef OPENSSL_FIPS
static int fips_RAND_set_rand_method(const RAND_METHOD *meth,
const RAND_METHOD **pmeth)
{
*pmeth = meth;
return 1;
}
static const RAND_METHOD *fips_RAND_get_rand_method(const RAND_METHOD **pmeth)
{
if (!*pmeth)
{
if(FIPS_mode())
*pmeth=FIPS_rand_method();
else
*pmeth = RAND_SSLeay();
}
if(FIPS_mode()
&& *pmeth != FIPS_rand_check())
{
RANDerr(RAND_F_FIPS_RAND_GET_RAND_METHOD,RAND_R_NON_FIPS_METHOD);
return 0;
}
return *pmeth;
}
static int (*RAND_set_rand_method_func)(const RAND_METHOD *meth,
const RAND_METHOD **pmeth)
= fips_RAND_set_rand_method;
static const RAND_METHOD *(*RAND_get_rand_method_func)
(const RAND_METHOD **pmeth)
= fips_RAND_get_rand_method;
#ifndef OPENSSL_NO_ENGINE
void int_RAND_set_callbacks(
int (*set_rand_func)(const RAND_METHOD *meth,
const RAND_METHOD **pmeth),
const RAND_METHOD *(*get_rand_func)
(const RAND_METHOD **pmeth))
{
RAND_set_rand_method_func = set_rand_func;
RAND_get_rand_method_func = get_rand_func;
}
#endif
int RAND_set_rand_method(const RAND_METHOD *meth)
{
return RAND_set_rand_method_func(meth, &default_RAND_meth);
}
const RAND_METHOD *RAND_get_rand_method(void)
{
return RAND_get_rand_method_func(&default_RAND_meth);
}
#else
#ifndef OPENSSL_NO_ENGINE
/* non-NULL if default_RAND_meth is ENGINE-provided */
static ENGINE *funct_ref =NULL;
#endif
static const RAND_METHOD *default_RAND_meth = NULL;
int RAND_set_rand_method(const RAND_METHOD *meth)
{
@@ -129,6 +196,8 @@ int RAND_set_rand_engine(ENGINE *engine)
}
#endif
#endif
void RAND_cleanup(void)
{
const RAND_METHOD *meth = RAND_get_rand_method();