diff options
| author | jsing <> | 2019-08-11 10:38:27 +0000 |
|---|---|---|
| committer | jsing <> | 2019-08-11 10:38:27 +0000 |
| commit | f7a527513ace17b70b14f3975dd212ba42e464c8 (patch) | |
| tree | 42de514d40b8fbdc31f900b32db6a05e12455f76 /src/lib/libcrypto/cms/cms_dd.c | |
| parent | 36509464f71e4876798f5e8cf8060f48bd0c6a69 (diff) | |
| download | openbsd-f7a527513ace17b70b14f3975dd212ba42e464c8.tar.gz openbsd-f7a527513ace17b70b14f3975dd212ba42e464c8.tar.bz2 openbsd-f7a527513ace17b70b14f3975dd212ba42e464c8.zip | |
Convert CMSerr() to CMSerror().
Diffstat (limited to 'src/lib/libcrypto/cms/cms_dd.c')
| -rw-r--r-- | src/lib/libcrypto/cms/cms_dd.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/libcrypto/cms/cms_dd.c b/src/lib/libcrypto/cms/cms_dd.c index b9422fab42..ac2fdbb30f 100644 --- a/src/lib/libcrypto/cms/cms_dd.c +++ b/src/lib/libcrypto/cms/cms_dd.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: cms_dd.c,v 1.11 2019/08/10 18:15:52 jsing Exp $ */ | 1 | /* $OpenBSD: cms_dd.c,v 1.12 2019/08/11 10:38:27 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 4 | * project. | 4 | * project. |
| @@ -113,7 +113,7 @@ cms_DigestedData_do_final(CMS_ContentInfo *cms, BIO *chain, int verify) | |||
| 113 | CMS_DigestedData *dd; | 113 | CMS_DigestedData *dd; |
| 114 | 114 | ||
| 115 | if (mctx == NULL) { | 115 | if (mctx == NULL) { |
| 116 | CMSerr(CMS_F_CMS_DIGESTEDDATA_DO_FINAL, ERR_R_MALLOC_FAILURE); | 116 | CMSerror(ERR_R_MALLOC_FAILURE); |
| 117 | goto err; | 117 | goto err; |
| 118 | } | 118 | } |
| 119 | 119 | ||
| @@ -127,14 +127,12 @@ cms_DigestedData_do_final(CMS_ContentInfo *cms, BIO *chain, int verify) | |||
| 127 | 127 | ||
| 128 | if (verify) { | 128 | if (verify) { |
| 129 | if (mdlen != (unsigned int)dd->digest->length) { | 129 | if (mdlen != (unsigned int)dd->digest->length) { |
| 130 | CMSerr(CMS_F_CMS_DIGESTEDDATA_DO_FINAL, | 130 | CMSerror(CMS_R_MESSAGEDIGEST_WRONG_LENGTH); |
| 131 | CMS_R_MESSAGEDIGEST_WRONG_LENGTH); | ||
| 132 | goto err; | 131 | goto err; |
| 133 | } | 132 | } |
| 134 | 133 | ||
| 135 | if (memcmp(md, dd->digest->data, mdlen)) | 134 | if (memcmp(md, dd->digest->data, mdlen)) |
| 136 | CMSerr(CMS_F_CMS_DIGESTEDDATA_DO_FINAL, | 135 | CMSerror(CMS_R_VERIFICATION_FAILURE); |
| 137 | CMS_R_VERIFICATION_FAILURE); | ||
| 138 | else | 136 | else |
| 139 | r = 1; | 137 | r = 1; |
| 140 | } else { | 138 | } else { |
