Commit 282af424 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add algorithm configuration module.

parent a81f3373

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


 Changes between 0.9.8e and 0.9.8f-fips  [xx XXX xxxx]



  *) Add algorithm config module. Currently just handles setting FIPS mode.

     [Steve Henson]



  *) Rewrite self tests and pairwise tests to use EVP. Add more extensive

     self tests for RSA in all digests and modes.

     [Steve Henson]

apps/openssl.cnf

+14 −6
Original line number Diff line number Diff line
@@ -8,9 +8,8 @@ 
HOME			= .

RANDFILE		= $ENV::HOME/.rnd



# Extra OBJECT IDENTIFIER info:

#oid_file		= $ENV::HOME/.oid

oid_section		= new_oids

# Uncomment out to enable OpenSSL configuration see config(3)

# openssl_conf = openssl_init



# To use this configuration file with the "-extfile" option of the

# "openssl x509" utility, name here the section containing the
@@ -19,13 +18,22 @@ oid_section = new_oids 
# (Alternatively, use a configuration file that has only

# X.509v3 extensions in its main [= default] section.)



[openssl_init]

# Extra OBJECT IDENTIFIER info:

oid_section = new_oids

alg_section = algs



[ new_oids ]



# We can add new OIDs in here for use by 'ca' and 'req'.

# We can add new OIDs in here for use by any config aware application

# Add a simple OID like this:

# testoid1=1.2.3.4

# shortname=Long Object Identifier Name, 1.2.3.4

# Or use config file substitution like this:

# testoid2=${testoid1}.5.6

# testoid2=OID2 LONG NAME, ${testoid1}.5.6, OTHER OID



[ algs ]

# Algorithm configuration options. Currently just fips_mode

fips_mode = no



####################################################################

[ ca ]

crypto/asn1/asn_moid.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static int do_create(char *value, char *name) 
		if (lntmp == NULL)

			return 0;

		memcpy(lntmp, ln, p - ln);

		lntmp[p - ln + 1] = 0;

		lntmp[p - ln] = 0;

		oid = OBJ_nid2obj(nid);

		oid->ln = lntmp;

		}

crypto/conf/conf_mall.c

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#include <openssl/dso.h>

#include <openssl/x509.h>

#include <openssl/asn1.h>

#include <openssl/evp.h>

#ifndef OPENSSL_NO_ENGINE

#include <openssl/engine.h>

#endif
@@ -76,5 +77,6 @@ void OPENSSL_load_builtin_modules(void) 
#ifndef OPENSSL_NO_ENGINE

	ENGINE_add_conf_module();

#endif

	EVP_add_alg_module();

	}

crypto/evp/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ TESTDATA=evptests.txt 
APPS=



LIB=$(TOP)/libcrypto.a

LIBSRC= encode.c digest.c dig_eng.c evp_enc.c evp_key.c evp_acnf.c \

LIBSRC= encode.c digest.c dig_eng.c evp_enc.c evp_key.c evp_acnf.c evp_cnf.c \

	e_des.c e_bf.c e_idea.c e_des3.c e_camellia.c\

	e_rc4.c e_aes.c names.c \

	e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c \
@@ -30,7 +30,7 @@ LIBSRC= encode.c digest.c dig_eng.c evp_enc.c evp_key.c evp_acnf.c \ 
	evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c \

	e_old.c



LIBOBJ=	encode.o digest.o dig_eng.o evp_enc.o evp_key.o evp_acnf.o \

LIBOBJ=	encode.o digest.o dig_eng.o evp_enc.o evp_key.o evp_acnf.o evp_cnf.o \

	e_des.o e_bf.o e_idea.o e_des3.o e_camellia.o\

	e_rc4.o e_aes.o names.o \

	e_xcbc_d.o e_rc2.o e_cast.o e_rc5.o \