Commit da414db4 authored by Geoff Thorpe's avatar Geoff Thorpe
Browse files

The handling of DSA_METHOD and DH_METHOD wasn't quite as problematic as 

with RSA_METHOD (the **_get_default_methods do set the default value if
it's not set). However, the code had some duplication and was a bit
conter-intuitive.
parent deb4d50e

crypto/dh/dh_lib.c

+1 −2
Original line number Diff line number Diff line
@@ -103,9 +103,8 @@ DH *DH_new_method(DH_METHOD *meth) 
		DHerr(DH_F_DH_NEW,ERR_R_MALLOC_FAILURE);

		return(NULL);

		}

	if(!default_DH_method) default_DH_method = DH_OpenSSL();

	if(meth) ret->meth = meth;

	else ret->meth = default_DH_method;

	else ret->meth = DH_get_default_method();

	ret->pad=0;

	ret->version=0;

	ret->p=NULL;

crypto/dsa/dsa_lib.c

+1 −2
Original line number Diff line number Diff line
@@ -107,9 +107,8 @@ DSA *DSA_new_method(DSA_METHOD *meth) 
		DSAerr(DSA_F_DSA_NEW,ERR_R_MALLOC_FAILURE);

		return(NULL);

		}

	if(!default_DSA_method) default_DSA_method = DSA_OpenSSL();

	if(meth) ret->meth = meth;

	else ret->meth = default_DSA_method;

	else ret->meth = DSA_get_default_method();

	ret->pad=0;

	ret->version=0;

	ret->write_params=1;