commit 3f5917f3200df64bbbbb5081445c953122ad475f
author David Benjamin <davidben@chromium.org> Mon Feb 23 02:15:50 2015 -0500
committer Adam Langley <agl@google.com> Mon Feb 23 19:44:02 2015 +0000
tree ad93f01be7fda88eb42e72af8cda6158613650f1
parent 86058a256bea9af50adf12cb1b7cd35eccc40a52

EVP_CIPHER_CTX_cleanup cannot fail.

There is exactly one implementation and it doesn't fail. Plus a cleanup
function that can fail is very bad manners; the caller has no choice but to
leak at that point.

Change-Id: I5b524617ef37bc7d92273472fa742416ea7dfd43
Reviewed-on: https://boringssl-review.googlesource.com/3564
Reviewed-by: Adam Langley <agl@google.com>

crypto/cipher/cipher.c

diff --git a/crypto/cipher/cipher.c b/crypto/cipher/cipher.c
index 4bb4196..4dccd97 100644
--- a/crypto/cipher/cipher.c
+++ b/crypto/cipher/cipher.c
@@ -94,8 +94,8 @@
 }
 
 int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c) {
-  if (c->cipher != NULL && c->cipher->cleanup && !c->cipher->cleanup(c)) {
-    return 0;
+  if (c->cipher != NULL && c->cipher->cleanup) {
+    c->cipher->cleanup(c);
   }
 
   if (c->cipher_data) {

crypto/cipher/e_aes.c

diff --git a/crypto/cipher/e_aes.c b/crypto/cipher/e_aes.c
index e012c3d..01c2d7d 100644
--- a/crypto/cipher/e_aes.c
+++ b/crypto/cipher/e_aes.c
@@ -445,13 +445,12 @@
   return 1;
 }
 
-static int aes_gcm_cleanup(EVP_CIPHER_CTX *c) {
+static void aes_gcm_cleanup(EVP_CIPHER_CTX *c) {
   EVP_AES_GCM_CTX *gctx = c->cipher_data;
   OPENSSL_cleanse(&gctx->gcm, sizeof(gctx->gcm));
   if (gctx->iv != c->iv) {
     OPENSSL_free(gctx->iv);
   }
-  return 1;
 }
 
 /* increment counter (64-bit int) by 1 */

crypto/cipher/internal.h

diff --git a/crypto/cipher/internal.h b/crypto/cipher/internal.h
index 2b8fb05..f28fd4c 100644
--- a/crypto/cipher/internal.h
+++ b/crypto/cipher/internal.h
@@ -97,7 +97,7 @@
   int (*cipher)(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in,
                 size_t inl);
 
-  int (*cleanup)(EVP_CIPHER_CTX *);
+  void (*cleanup)(EVP_CIPHER_CTX *);
 
   int (*ctrl)(EVP_CIPHER_CTX *, int type, int arg, void *ptr);
 };

include/openssl/cipher.h

diff --git a/include/openssl/cipher.h b/include/openssl/cipher.h
index 25a0118..97bf096 100644
--- a/include/openssl/cipher.h
+++ b/include/openssl/cipher.h
@@ -117,8 +117,8 @@
  * |EVP_CIPHER_CTX_init| and returns it, or NULL on allocation failure. */
 OPENSSL_EXPORT EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void);
 
-/* EVP_CIPHER_CTX_cleanup frees any memory referenced by |ctx|. It returns one
- * on success and zero otherwise. */
+/* EVP_CIPHER_CTX_cleanup frees any memory referenced by |ctx|. It returns
+ * one. */
 OPENSSL_EXPORT int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *ctx);
 
 /* EVP_CIPHER_CTX_free calls |EVP_CIPHER_CTX_cleanup| on |ctx| and then frees