OERV-RUNTIME/boringssl
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make |EVP_CIPHER_CTX_reset| return one.

Browse Source 
(It does upstream.)

Change-Id: I0c00e393b32a7ed237abba682b45d81889cf9fa8
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/37245
Commit-Queue: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
This commit is contained in:
Adam Langley
2019-08-26 20:30:58 +00:00
committed by CQ bot account: commit-bot@chromium.org
parent 05cd93068b
commit cf67ec09e4
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crypto/fipsmodule/cipher/cipher.c
+2 -1
View File
@@ -125,9 +125,10 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in) {
return 1;
}
void EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx) {
int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx) {
EVP_CIPHER_CTX_cleanup(ctx);
EVP_CIPHER_CTX_init(ctx);
return 1;
}
int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
include/openssl/cipher.h
+2 -2
View File
@@ -136,8 +136,8 @@ OPENSSL_EXPORT int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out,
const EVP_CIPHER_CTX *in);
// EVP_CIPHER_CTX_reset calls |EVP_CIPHER_CTX_cleanup| followed by
// |EVP_CIPHER_CTX_init|.
OPENSSL_EXPORT void EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx);
// |EVP_CIPHER_CTX_init| and returns one.
OPENSSL_EXPORT int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx);
// Cipher context configuration.