Fix spelling errors in CMS. #3463
Conversation
openssl-machine
added
the
hold: cla required
|
Note: this uses the same notation I'm proposing in #3460 |
richsalz
removed
the
hold: cla required
|
For "bookkeeping" purposes I would insist on making this commit specifically about CMS and not spelling of specific word[s]. This means that ghashv8-armx.pl and d2i_X509.pod should not be part of it. |
include/openssl/cms.h
Outdated
| @@ -491,14 +491,16 @@ int ERR_load_CMS_strings(void); | |||
| # define CMS_R_TYPE_NOT_ENVELOPED_DATA 146 | |||
| # define CMS_R_UNABLE_TO_FINALIZE_CONTEXT 147 | |||
| # define CMS_R_UNKNOWN_CIPHER 148 | |||
| # define CMS_R_UNKNOWN_DIGEST_ALGORIHM 149 | |||
| # define CMS_R_UNKNOWN_DIGEST_ALGORITHM 149 | |||
| # define CMS_R_UNKNOWN_DIGEST_ALGORITM /*compat*/ CMS_R_UNKNOWN_DIGEST_ALGORITHM | |||
There was a problem hiding this comment.
CMS_R_* are automatically generated and question is what does mkerr.pl do to compatibility definitions.
There was a problem hiding this comment.
Any compat things must go before the BEGIN ERROR CODES comment. Otherwise they will be wiped out.
There was a problem hiding this comment.
So just a numerical definition? Or with a comment indicating the correct spelling?
There was a problem hiding this comment.
There can be no custom code after the BEGIN ERROR comment.
|
@dot-asm: sure, I can split those two out. That's perfectly reasonable. |
mark CMS_R_UNKNOWN_DIGEST_ALGORITM as compat
mark CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE as compat
jsoref
force-pushed
the
spelling-algorithm
branch
from
39cb7ee
to
ad4ca17
Compare
There was a problem hiding this comment.
Approved with following reservation. Commits will be squashed to one and commit message will be edited. My suggestion for new message is "Fix spelling errors in CMS. Unfortunately it affects public cms.h header, for which reason misspelled names are preserved for backward compatibility."
Just in case, you're not required to do anything in this request, as it can be done upon actual commit to repository. |
dot-asm
added
branch: master
Unfortunately it affects error code macros in public cms.h header, for which reason misspelled names are preserved for backward compatibility. Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Kurt Roeckx <kurt@openssl.org> (Merged from #3463)
dot-asm
removed
the
approval: review pending
|
Merged. Thanks for report. |
mark CMS_R_UNKNOWN_DIGEST_ALGORITM as compat
mark CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE as compat
Split from #3459