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

Fix typo and add header files to err library.

parent d5a37b02

crypto/cms/cms.h

+1 −1
Original line number Diff line number Diff line
@@ -395,9 +395,9 @@ void ERR_load_CMS_strings(void); 


/* Reason codes. */

#define CMS_R_ADD_SIGNER_ERROR				 99

#define CMS_R_CERTIFICATE_ALREADY_PRESENT		 175

#define CMS_R_CERTIFICATE_HAS_NO_KEYID			 160

#define CMS_R_CERTIFICATE_VERIFY_ERROR			 100

#define CMS_R_CERTIFICTATE_ALREADY_PRESENT		 175

#define CMS_R_CIPHER_INITIALISATION_ERROR		 101

#define CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR	 102

#define CMS_R_CMS_DATAFINAL_ERROR			 103

crypto/cms/cms_err.c

+12 −12
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ static ERR_STRING_DATA CMS_str_functs[]= 
{ERR_FUNC(CMS_F_CMS_ADD1_SIGNER),	"CMS_add1_signer"},

{ERR_FUNC(CMS_F_CMS_ADD1_SIGNINGTIME),	"CMS_ADD1_SIGNINGTIME"},

{ERR_FUNC(CMS_F_CMS_COMPRESS),	"CMS_compress"},

{ERR_FUNC(CMS_F_CMS_COMPRESSEDDATA_CREATE),	"CMS_COMPRESSEDDATA_CREATE"},

{ERR_FUNC(CMS_F_CMS_COMPRESSEDDATA_INIT_BIO),	"CMS_COMPRESSEDDATA_INIT_BIO"},

{ERR_FUNC(CMS_F_CMS_COMPRESSEDDATA_CREATE),	"cms_CompressedData_create"},

{ERR_FUNC(CMS_F_CMS_COMPRESSEDDATA_INIT_BIO),	"cms_CompressedData_init_bio"},

{ERR_FUNC(CMS_F_CMS_COPY_CONTENT),	"CMS_COPY_CONTENT"},

{ERR_FUNC(CMS_F_CMS_COPY_MESSAGEDIGEST),	"CMS_COPY_MESSAGEDIGEST"},

{ERR_FUNC(CMS_F_CMS_DATA),	"CMS_data"},
@@ -88,18 +88,18 @@ static ERR_STRING_DATA CMS_str_functs[]= 
{ERR_FUNC(CMS_F_CMS_DECRYPT),	"CMS_decrypt"},

{ERR_FUNC(CMS_F_CMS_DECRYPT_SET1_KEY),	"CMS_decrypt_set1_key"},

{ERR_FUNC(CMS_F_CMS_DECRYPT_SET1_PKEY),	"CMS_decrypt_set1_pkey"},

{ERR_FUNC(CMS_F_CMS_DIGESTALGORITHM_FIND_CTX),	"CMS_DIGESTALGORITHM_FIND_CTX"},

{ERR_FUNC(CMS_F_CMS_DIGESTALGORITHM_INIT_BIO),	"CMS_DIGESTALGORITHM_INIT_BIO"},

{ERR_FUNC(CMS_F_CMS_DIGESTEDDATA_DO_FINAL),	"CMS_DIGESTEDDATA_DO_FINAL"},

{ERR_FUNC(CMS_F_CMS_DIGESTALGORITHM_FIND_CTX),	"cms_DigestAlgorithm_find_ctx"},

{ERR_FUNC(CMS_F_CMS_DIGESTALGORITHM_INIT_BIO),	"cms_DigestAlgorithm_init_bio"},

{ERR_FUNC(CMS_F_CMS_DIGESTEDDATA_DO_FINAL),	"cms_DigestedData_do_final"},

{ERR_FUNC(CMS_F_CMS_DIGEST_VERIFY),	"CMS_digest_verify"},

{ERR_FUNC(CMS_F_CMS_ENCODE_RECEIPT),	"CMS_ENCODE_RECEIPT"},

{ERR_FUNC(CMS_F_CMS_ENCODE_RECEIPT),	"cms_encode_Receipt"},

{ERR_FUNC(CMS_F_CMS_ENCRYPT),	"CMS_encrypt"},

{ERR_FUNC(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO),	"CMS_ENCRYPTEDCONTENT_INIT_BIO"},

{ERR_FUNC(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO),	"cms_EncryptedContent_init_bio"},

{ERR_FUNC(CMS_F_CMS_ENCRYPTEDDATA_DECRYPT),	"CMS_EncryptedData_decrypt"},

{ERR_FUNC(CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT),	"CMS_EncryptedData_encrypt"},

{ERR_FUNC(CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY),	"CMS_EncryptedData_set1_key"},

{ERR_FUNC(CMS_F_CMS_ENVELOPEDDATA_CREATE),	"CMS_EnvelopedData_create"},

{ERR_FUNC(CMS_F_CMS_ENVELOPEDDATA_INIT_BIO),	"CMS_ENVELOPEDDATA_INIT_BIO"},

{ERR_FUNC(CMS_F_CMS_ENVELOPEDDATA_INIT_BIO),	"cms_EnvelopedData_init_bio"},

{ERR_FUNC(CMS_F_CMS_ENVELOPED_DATA_INIT),	"CMS_ENVELOPED_DATA_INIT"},

{ERR_FUNC(CMS_F_CMS_FINAL),	"CMS_final"},

{ERR_FUNC(CMS_F_CMS_GET0_CERTIFICATE_CHOICES),	"CMS_GET0_CERTIFICATE_CHOICES"},
@@ -108,9 +108,9 @@ static ERR_STRING_DATA CMS_str_functs[]= 
{ERR_FUNC(CMS_F_CMS_GET0_ENVELOPED),	"CMS_GET0_ENVELOPED"},

{ERR_FUNC(CMS_F_CMS_GET0_REVOCATION_CHOICES),	"CMS_GET0_REVOCATION_CHOICES"},

{ERR_FUNC(CMS_F_CMS_GET0_SIGNED),	"CMS_GET0_SIGNED"},

{ERR_FUNC(CMS_F_CMS_MSGSIGDIGEST_ADD1),	"CMS_MSGSIGDIGEST_ADD1"},

{ERR_FUNC(CMS_F_CMS_MSGSIGDIGEST_ADD1),	"cms_msgSigDigest_add1"},

{ERR_FUNC(CMS_F_CMS_RECEIPTREQUEST_CREATE0),	"CMS_ReceiptRequest_create0"},

{ERR_FUNC(CMS_F_CMS_RECEIPT_VERIFY),	"CMS_RECEIPT_VERIFY"},

{ERR_FUNC(CMS_F_CMS_RECEIPT_VERIFY),	"cms_Receipt_verify"},

{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_DECRYPT),	"CMS_RecipientInfo_decrypt"},

{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT),	"CMS_RECIPIENTINFO_KEKRI_DECRYPT"},

{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT),	"CMS_RECIPIENTINFO_KEKRI_ENCRYPT"},
@@ -123,7 +123,7 @@ static ERR_STRING_DATA CMS_str_functs[]= 
{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID),	"CMS_RecipientInfo_ktri_get0_signer_id"},

{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_SET0_KEY),	"CMS_RecipientInfo_set0_key"},

{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_SET0_PKEY),	"CMS_RecipientInfo_set0_pkey"},

{ERR_FUNC(CMS_F_CMS_SET1_SIGNERIDENTIFIER),	"CMS_SET1_SIGNERIDENTIFIER"},

{ERR_FUNC(CMS_F_CMS_SET1_SIGNERIDENTIFIER),	"cms_set1_SignerIdentifier"},

{ERR_FUNC(CMS_F_CMS_SET_DETACHED),	"CMS_set_detached"},

{ERR_FUNC(CMS_F_CMS_SIGN),	"CMS_sign"},

{ERR_FUNC(CMS_F_CMS_SIGNED_DATA_INIT),	"CMS_SIGNED_DATA_INIT"},
@@ -142,9 +142,9 @@ static ERR_STRING_DATA CMS_str_functs[]= 
static ERR_STRING_DATA CMS_str_reasons[]=

	{

{ERR_REASON(CMS_R_ADD_SIGNER_ERROR)      ,"add signer error"},

{ERR_REASON(CMS_R_CERTIFICATE_ALREADY_PRESENT),"certificate already present"},

{ERR_REASON(CMS_R_CERTIFICATE_HAS_NO_KEYID),"certificate has no keyid"},

{ERR_REASON(CMS_R_CERTIFICATE_VERIFY_ERROR),"certificate verify error"},

{ERR_REASON(CMS_R_CERTIFICTATE_ALREADY_PRESENT),"certifictate already present"},

{ERR_REASON(CMS_R_CIPHER_INITIALISATION_ERROR),"cipher initialisation error"},

{ERR_REASON(CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR),"cipher parameter initialisation error"},

{ERR_REASON(CMS_R_CMS_DATAFINAL_ERROR)   ,"cms datafinal error"},

crypto/cms/cms_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ int CMS_add0_cert(CMS_ContentInfo *cms, X509 *cert) 
			if (!X509_cmp(cch->d.certificate, cert))

				{

				CMSerr(CMS_F_CMS_ADD0_CERT, 

					CMS_R_CERTIFICTATE_ALREADY_PRESENT);

					CMS_R_CERTIFICATE_ALREADY_PRESENT);

				return 0;

				}

			}

crypto/err/openssl.ec

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ L CMS crypto/cms/cms.h crypto/cms/cms_err.c 
# additional header files to be scanned for function names

L NONE		crypto/x509/x509_vfy.h		NONE

L NONE		crypto/ec/ec_lcl.h		NONE

L NONE		crypto/asn1/asn_lcl.h		NONE

L NONE		crypto/cms/cms_lcl.h		NONE





F RSAREF_F_RSA_BN2BIN