Commit 3d479299 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update S/MIME code to use default digest.

parent 03919683

crypto/pkcs7/pk7_lib.c

+14 −0
Original line number Original line Diff line number Diff line
@@ -390,6 +390,20 @@ PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey, 
	{

	{

	PKCS7_SIGNER_INFO *si;

	PKCS7_SIGNER_INFO *si;





	if (dgst == NULL)

		{

		int def_nid;

		if (EVP_PKEY_get_default_digest_nid(pkey, &def_nid) <= 0)

			goto err;

		dgst = EVP_get_digestbynid(def_nid);

		if (dgst == NULL)

			{

			PKCS7err(PKCS7_F_PKCS7_ADD_SIGNATURE,

						PKCS7_R_NO_DEFAULT_DIGEST);

			goto err;

			}

		}



	if ((si=PKCS7_SIGNER_INFO_new()) == NULL) goto err;

	if ((si=PKCS7_SIGNER_INFO_new()) == NULL) goto err;

	if (!PKCS7_SIGNER_INFO_set(si,x509,pkey,dgst)) goto err;

	if (!PKCS7_SIGNER_INFO_set(si,x509,pkey,dgst)) goto err;

	if (!PKCS7_add_signer(p7,si)) goto err;

	if (!PKCS7_add_signer(p7,si)) goto err;

crypto/pkcs7/pk7_smime.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -86,7 +86,7 @@ PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, 




	PKCS7_content_new(p7, NID_pkcs7_data);

	PKCS7_content_new(p7, NID_pkcs7_data);





    	if (!(si = PKCS7_add_signature(p7,signcert,pkey,EVP_sha1()))) {

    	if (!(si = PKCS7_add_signature(p7,signcert,pkey,NULL))) {

		PKCS7err(PKCS7_F_PKCS7_SIGN,PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR);

		PKCS7err(PKCS7_F_PKCS7_SIGN,PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR);

		PKCS7_free(p7);

		PKCS7_free(p7);

		return NULL;

		return NULL;

crypto/pkcs7/pkcs7.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -394,6 +394,7 @@ void ERR_load_PKCS7_strings(void); 
#define PKCS7_F_PKCS7_ADD_CERTIFICATE			 100

#define PKCS7_F_PKCS7_ADD_CERTIFICATE			 100

#define PKCS7_F_PKCS7_ADD_CRL				 101

#define PKCS7_F_PKCS7_ADD_CRL				 101

#define PKCS7_F_PKCS7_ADD_RECIPIENT_INFO		 102

#define PKCS7_F_PKCS7_ADD_RECIPIENT_INFO		 102

#define PKCS7_F_PKCS7_ADD_SIGNATURE			 131

#define PKCS7_F_PKCS7_ADD_SIGNER			 103

#define PKCS7_F_PKCS7_ADD_SIGNER			 103

#define PKCS7_F_PKCS7_BIO_ADD_DIGEST			 125

#define PKCS7_F_PKCS7_BIO_ADD_DIGEST			 125

#define PKCS7_F_PKCS7_CTRL				 104

#define PKCS7_F_PKCS7_CTRL				 104
@@ -440,6 +441,7 @@ void ERR_load_PKCS7_strings(void); 
#define PKCS7_R_MISSING_CERIPEND_INFO			 103

#define PKCS7_R_MISSING_CERIPEND_INFO			 103

#define PKCS7_R_NO_CONTENT				 122

#define PKCS7_R_NO_CONTENT				 122

#define PKCS7_R_NO_CONTENT_TYPE				 135

#define PKCS7_R_NO_CONTENT_TYPE				 135

#define PKCS7_R_NO_DEFAULT_DIGEST			 151

#define PKCS7_R_NO_MULTIPART_BODY_FAILURE		 136

#define PKCS7_R_NO_MULTIPART_BODY_FAILURE		 136

#define PKCS7_R_NO_MULTIPART_BOUNDARY			 137

#define PKCS7_R_NO_MULTIPART_BOUNDARY			 137

#define PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE	 115

#define PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE	 115

crypto/pkcs7/pkcs7err.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -76,6 +76,7 @@ static ERR_STRING_DATA PKCS7_str_functs[]= 
{ERR_FUNC(PKCS7_F_PKCS7_ADD_CERTIFICATE),	"PKCS7_add_certificate"},

{ERR_FUNC(PKCS7_F_PKCS7_ADD_CERTIFICATE),	"PKCS7_add_certificate"},

{ERR_FUNC(PKCS7_F_PKCS7_ADD_CRL),	"PKCS7_add_crl"},

{ERR_FUNC(PKCS7_F_PKCS7_ADD_CRL),	"PKCS7_add_crl"},

{ERR_FUNC(PKCS7_F_PKCS7_ADD_RECIPIENT_INFO),	"PKCS7_add_recipient_info"},

{ERR_FUNC(PKCS7_F_PKCS7_ADD_RECIPIENT_INFO),	"PKCS7_add_recipient_info"},

{ERR_FUNC(PKCS7_F_PKCS7_ADD_SIGNATURE),	"PKCS7_add_signature"},

{ERR_FUNC(PKCS7_F_PKCS7_ADD_SIGNER),	"PKCS7_add_signer"},

{ERR_FUNC(PKCS7_F_PKCS7_ADD_SIGNER),	"PKCS7_add_signer"},

{ERR_FUNC(PKCS7_F_PKCS7_BIO_ADD_DIGEST),	"PKCS7_BIO_ADD_DIGEST"},

{ERR_FUNC(PKCS7_F_PKCS7_BIO_ADD_DIGEST),	"PKCS7_BIO_ADD_DIGEST"},

{ERR_FUNC(PKCS7_F_PKCS7_CTRL),	"PKCS7_CTRL"},

{ERR_FUNC(PKCS7_F_PKCS7_CTRL),	"PKCS7_CTRL"},
@@ -125,6 +126,7 @@ static ERR_STRING_DATA PKCS7_str_reasons[]= 
{ERR_REASON(PKCS7_R_MISSING_CERIPEND_INFO),"missing ceripend info"},

{ERR_REASON(PKCS7_R_MISSING_CERIPEND_INFO),"missing ceripend info"},

{ERR_REASON(PKCS7_R_NO_CONTENT)          ,"no content"},

{ERR_REASON(PKCS7_R_NO_CONTENT)          ,"no content"},

{ERR_REASON(PKCS7_R_NO_CONTENT_TYPE)     ,"no content type"},

{ERR_REASON(PKCS7_R_NO_CONTENT_TYPE)     ,"no content type"},

{ERR_REASON(PKCS7_R_NO_DEFAULT_DIGEST)   ,"no default digest"},

{ERR_REASON(PKCS7_R_NO_MULTIPART_BODY_FAILURE),"no multipart body failure"},

{ERR_REASON(PKCS7_R_NO_MULTIPART_BODY_FAILURE),"no multipart body failure"},

{ERR_REASON(PKCS7_R_NO_MULTIPART_BOUNDARY),"no multipart boundary"},

{ERR_REASON(PKCS7_R_NO_MULTIPART_BOUNDARY),"no multipart boundary"},

{ERR_REASON(PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE),"no recipient matches certificate"},

{ERR_REASON(PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE),"no recipient matches certificate"},