Commit df578aa0 authored by Josh Soref's avatar Josh Soref Committed by Andy Polyakov
Browse files

Fix spelling errors in CMS. 



Unfortunately it affects error code macros in public cms.h header, for
which reason misspelled names are preserved for backward compatibility.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3463)
parent b72668a0

crypto/cms/cms_env.c

+1 −1
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ int CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri) 


    default:

        CMSerr(CMS_F_CMS_RECIPIENTINFO_DECRYPT,

               CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE);

               CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE);

        return 0;

    }

}

crypto/cms/cms_err.c

+3 −3
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static ERR_STRING_DATA CMS_str_reasons[] = { 
    {ERR_REASON(CMS_R_UNABLE_TO_FINALIZE_CONTEXT),

     "unable to finalize context"},

    {ERR_REASON(CMS_R_UNKNOWN_CIPHER), "unknown cipher"},

    {ERR_REASON(CMS_R_UNKNOWN_DIGEST_ALGORIHM), "unknown digest algorihm"},

    {ERR_REASON(CMS_R_UNKNOWN_DIGEST_ALGORITHM), "unknown digest algorithm"},

    {ERR_REASON(CMS_R_UNKNOWN_ID), "unknown id"},

    {ERR_REASON(CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM),

     "unsupported compression algorithm"},
@@ -233,8 +233,8 @@ static ERR_STRING_DATA CMS_str_reasons[] = { 
     "unsupported key encryption algorithm"},

    {ERR_REASON(CMS_R_UNSUPPORTED_RECIPIENT_TYPE),

     "unsupported recipient type"},

    {ERR_REASON(CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE),

     "unsupported recpientinfo type"},

    {ERR_REASON(CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE),

     "unsupported recipientinfo type"},

    {ERR_REASON(CMS_R_UNSUPPORTED_TYPE), "unsupported type"},

    {ERR_REASON(CMS_R_UNWRAP_ERROR), "unwrap error"},

    {ERR_REASON(CMS_R_UNWRAP_FAILURE), "unwrap failure"},

crypto/cms/cms_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ BIO *cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm) 
    digest = EVP_get_digestbyobj(digestoid);

    if (!digest) {

        CMSerr(CMS_F_CMS_DIGESTALGORITHM_INIT_BIO,

               CMS_R_UNKNOWN_DIGEST_ALGORIHM);

               CMS_R_UNKNOWN_DIGEST_ALGORITHM);

        goto err;

    }

    mdbio = BIO_new(BIO_f_md());

doc/man3/CMS_decrypt.pod

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ in advance using the CMS utility functions such as CMS_set1_pkey(). In this 
case both B<cert> and B<pkey> should be set to NULL.



To process KEKRecipientInfo types CMS_set1_key() or CMS_RecipientInfo_set0_key()

and CMS_ReceipientInfo_decrypt() should be called before CMS_decrypt() and

and CMS_RecipientInfo_decrypt() should be called before CMS_decrypt() and

B<cert> and B<pkey> set to NULL.



The following flags can be passed in the B<flags> parameter.

doc/man3/CMS_get0_RecipientInfos.pod

+2 −2
Original line number Diff line number Diff line
@@ -85,11 +85,11 @@ of CMS_decrypt() is not appropriate. 


In typical usage and application will retrieve all CMS_RecipientInfo structures

using CMS_get0_RecipientInfos() and check the type of each using

CMS_RecpientInfo_type(). Depending on the type the CMS_RecipientInfo structure

CMS_RecipientInfo_type(). Depending on the type the CMS_RecipientInfo structure

can be ignored or its key identifier data retrieved using an appropriate

function. Then if the corresponding secret or private key can be obtained by

any appropriate means it can then associated with the structure and

CMS_RecpientInfo_decrypt() called. If successful CMS_decrypt() can be called

CMS_RecipientInfo_decrypt() called. If successful CMS_decrypt() can be called

with a NULL key to decrypt the enveloped content.



The CMS_RecipientInfo_encrypt() can be used to add a new recipient to an