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

Remove defunct FIPS_allow_md5() and related functions.

Browse Source
This commit is contained in:
Dr. Stephen Henson
2005-04-22 01:06:59 +00:00
parent 4f6c2bacb1
commit 92ad8e5c37
4 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openssl.c
View File

@@ -250,8 +250,6 @@ int main(int Argc, char *Argv[])
EXIT(1); EXIT(1);
} }
in_FIPS_mode = 1; in_FIPS_mode = 1;
if (getenv("OPENSSL_FIPS_MD5"))
FIPS_allow_md5(1);
} }
#endif #endif
if (bio_err == NULL) if (bio_err == NULL)

27
fips/fips.c
View File

@@ -63,7 +63,6 @@
#define PATH_MAX 1024 #define PATH_MAX 1024
#endif #endif
static int fips_md5_allowed = 0;
static int fips_selftest_fail = 0; static int fips_selftest_fail = 0;
static int fips_mode = 0; static int fips_mode = 0;
static const void *fips_rand_check = 0; static const void *fips_rand_check = 0;
@@ -120,32 +119,6 @@ const void *FIPS_rand_check(void)
return ret; return ret;
} }
void FIPS_allow_md5(int onoff)
{
if (fips_is_started())
{
int owning_thread = fips_is_owning_thread();
if (!owning_thread) fips_w_lock();
fips_md5_allowed = onoff;
if (!owning_thread) fips_w_unlock();
}
}
int FIPS_md5_allowed(void)
{
int ret = 1;
if (fips_is_started())
{
int owning_thread = fips_is_owning_thread();
if (!owning_thread) fips_r_lock();
ret = fips_md5_allowed;
if (!owning_thread) fips_r_unlock();
}
return ret;
}
int FIPS_selftest_failed(void) int FIPS_selftest_failed(void)
{ {
int ret = 0; int ret = 0;

2
fips/fips.h
View File

@@ -60,8 +60,6 @@ struct dsa_st;
int FIPS_mode_set(int onoff,const char *path); int FIPS_mode_set(int onoff,const char *path);
int FIPS_mode(void); int FIPS_mode(void);
const void *FIPS_rand_check(void); const void *FIPS_rand_check(void);
void FIPS_allow_md5(int onoff);
int FIPS_md5_allowed(void);
int FIPS_selftest_failed(void); int FIPS_selftest_failed(void);
int FIPS_dsa_check(struct dsa_st *dsa); int FIPS_dsa_check(struct dsa_st *dsa);
void FIPS_corrupt_sha1(void); void FIPS_corrupt_sha1(void);

4
fips/fipshashes.c
View File

@@ -1,7 +1,7 @@
const char * const FIPS_source_hashes[] = { const char * const FIPS_source_hashes[] = {
"HMAC-SHA1(fips.c)= f14ae9175119f045f1c645a2458602ccd2b2a34e", "HMAC-SHA1(fips.c)= bce1e4b169f95f66b0eaf86847b41d9a2f62acd6",
"HMAC-SHA1(fips_err_wrapper.c)= d3e2be316062510312269e98f964cb87e7577898", "HMAC-SHA1(fips_err_wrapper.c)= d3e2be316062510312269e98f964cb87e7577898",
"HMAC-SHA1(fips.h)= 70f0181f269e6b09a9e3e6d9ff82f3461bd41222", "HMAC-SHA1(fips.h)= 564e34c12d6743a9be06d5da74608a71937c872a",
"HMAC-SHA1(fips_err.h)= 03468e3b593f7528fd934e49bf052c23cc98d301", "HMAC-SHA1(fips_err.h)= 03468e3b593f7528fd934e49bf052c23cc98d301",
"HMAC-SHA1(aes/fips_aes_core.c)= b70bbbd675efe0613da0d57055310926a0104d55", "HMAC-SHA1(aes/fips_aes_core.c)= b70bbbd675efe0613da0d57055310926a0104d55",
"HMAC-SHA1(aes/asm/fips-ax86-elf.s)= 0d1c89f93cbf7bf4854bb238627c99ecda462f17", "HMAC-SHA1(aes/asm/fips-ax86-elf.s)= 0d1c89f93cbf7bf4854bb238627c99ecda462f17",