Bladeren bron

Match OpenSSL's EVP_MD_CTX_reset return value.

In neither OpenSSL nor BoringSSL can this function actually fail, but
OpenSSL makes it return one anyway. Match them for compatibility.

Change-Id: I497437321ad9ccc5da738f06cd5b19c467167575
Reviewed-on: https://boringssl-review.googlesource.com/28784
Commit-Queue: Steven Valdez <svaldez@google.com>
Reviewed-by: Steven Valdez <svaldez@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
kris/onging/CECPQ3_patch15
David Benjamin 6 jaren geleden
committed by CQ bot account: commit-bot@chromium.org
bovenliggende
commit
a827d1809c
2 gewijzigde bestanden met toevoegingen van 5 en 3 verwijderingen
  1. +2
    -1
      crypto/fipsmodule/digest/digest.c
  2. +3
    -2
      include/openssl/digest.h

+ 2
- 1
crypto/fipsmodule/digest/digest.c Bestand weergeven

@@ -166,9 +166,10 @@ int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in) {
return EVP_MD_CTX_copy_ex(out, in);
}

void EVP_MD_CTX_reset(EVP_MD_CTX *ctx) {
int EVP_MD_CTX_reset(EVP_MD_CTX *ctx) {
EVP_MD_CTX_cleanup(ctx);
EVP_MD_CTX_init(ctx);
return 1;
}

int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *engine) {


+ 3
- 2
include/openssl/digest.h Bestand weergeven

@@ -122,8 +122,9 @@ OPENSSL_EXPORT void EVP_MD_CTX_free(EVP_MD_CTX *ctx);
// copy of |in|. It returns one on success and zero on error.
OPENSSL_EXPORT int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in);

// EVP_MD_CTX_reset calls |EVP_MD_CTX_cleanup| followed by |EVP_MD_CTX_init|.
OPENSSL_EXPORT void EVP_MD_CTX_reset(EVP_MD_CTX *ctx);
// EVP_MD_CTX_reset calls |EVP_MD_CTX_cleanup| followed by |EVP_MD_CTX_init|. It
// returns one.
OPENSSL_EXPORT int EVP_MD_CTX_reset(EVP_MD_CTX *ctx);


// Digest operations.


Laden…
Annuleren
Opslaan