From commits-return-12363-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Mon Dec 5 16:51:33 2011 Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E3E0F708D for ; Mon, 5 Dec 2011 16:51:33 +0000 (UTC) Received: (qmail 20142 invoked by uid 500); 5 Dec 2011 16:51:33 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 20078 invoked by uid 500); 5 Dec 2011 16:51:33 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 20071 invoked by uid 99); 5 Dec 2011 16:51:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Dec 2011 16:51:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Dec 2011 16:51:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D7C3A2388860 for ; Mon, 5 Dec 2011 16:51:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1210524 - in /apr/apr/trunk: crypto/apr_crypto.c crypto/apr_crypto_nss.c crypto/apr_crypto_openssl.c include/apr_crypto.h Date: Mon, 05 Dec 2011 16:51:08 -0000 To: commits@apr.apache.org From: minfrin@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111205165108.D7C3A2388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: minfrin Date: Mon Dec 5 16:51:07 2011 New Revision: 1210524 URL: http://svn.apache.org/viewvc?rev=1210524&view=rev Log: apr_crypto: Clear out buffers that are allocated by us when the pool from which the memory was allocated from is cleaned up. Modified: apr/apr/trunk/crypto/apr_crypto.c apr/apr/trunk/crypto/apr_crypto_nss.c apr/apr/trunk/crypto/apr_crypto_openssl.c apr/apr/trunk/include/apr_crypto.h Modified: apr/apr/trunk/crypto/apr_crypto.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto.c?rev=1210524&r1=1210523&r2=1210524&view=diff ============================================================================== --- apr/apr/trunk/crypto/apr_crypto.c (original) +++ apr/apr/trunk/crypto/apr_crypto.c Mon Dec 5 16:51:07 2011 @@ -56,6 +56,11 @@ APR_TYPEDEF_STRUCT(apr_crypto_block_t, const apr_crypto_t *f; ) +typedef struct apr_crypto_clear_t { + void *buffer; + apr_size_t size; +} apr_crypto_clear_t; + #if !APR_HAVE_MODULAR_DSO #define DRIVER_LOAD(name,driver,pool,params) \ { \ @@ -118,6 +123,31 @@ APR_DECLARE(apr_status_t) apr_crypto_ini return ret; } +static apr_status_t crypto_clear(void *ptr) +{ + apr_crypto_clear_t *clear = (apr_crypto_clear_t *)ptr; + + memset(clear->buffer, 0, clear->size); + clear->buffer = NULL; + clear->size = 0; + + return APR_SUCCESS; +} + +APR_DECLARE(apr_status_t) apr_crypto_clear(apr_pool_t *pool, + void *buffer, apr_size_t size) +{ + apr_crypto_clear_t *clear = apr_palloc(pool, sizeof(apr_crypto_clear_t)); + + clear->buffer = buffer; + clear->size = size; + + apr_pool_cleanup_register(pool, clear, crypto_clear, + apr_pool_cleanup_null); + + return APR_SUCCESS; +} + APR_DECLARE(apr_status_t) apr_crypto_get_driver( const apr_crypto_driver_t **driver, const char *name, const char *params, const apu_err_t **result, apr_pool_t *pool) Modified: apr/apr/trunk/crypto/apr_crypto_nss.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto_nss.c?rev=1210524&r1=1210523&r2=1210524&view=diff ============================================================================== --- apr/apr/trunk/crypto/apr_crypto_nss.c (original) +++ apr/apr/trunk/crypto/apr_crypto_nss.c Mon Dec 5 16:51:07 2011 @@ -551,6 +551,7 @@ static apr_status_t crypto_block_encrypt if (!usedIv) { return APR_ENOMEM; } + apr_crypto_clear(p, usedIv, key->ivSize); s = PK11_GenerateRandom(usedIv, key->ivSize); if (s != SECSuccess) { return APR_ENOIV; @@ -622,6 +623,7 @@ static apr_status_t crypto_block_encrypt if (!buffer) { return APR_ENOMEM; } + apr_crypto_clear(block->pool, buffer, inlen + block->blockSize); *out = buffer; } @@ -785,6 +787,7 @@ static apr_status_t crypto_block_decrypt if (!buffer) { return APR_ENOMEM; } + apr_crypto_clear(block->pool, buffer, inlen + block->blockSize); *out = buffer; } Modified: apr/apr/trunk/crypto/apr_crypto_openssl.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto_openssl.c?rev=1210524&r1=1210523&r2=1210524&view=diff ============================================================================== --- apr/apr/trunk/crypto/apr_crypto_openssl.c (original) +++ apr/apr/trunk/crypto/apr_crypto_openssl.c Mon Dec 5 16:51:07 2011 @@ -431,6 +431,7 @@ static apr_status_t crypto_passphrase(ap if (!key->key) { return APR_ENOMEM; } + apr_crypto_clear(p, key->key, key->keyLen); /* generate the key */ if (PKCS5_PBKDF2_HMAC_SHA1(pass, passLen, (unsigned char *) salt, saltLen, @@ -504,6 +505,7 @@ static apr_status_t crypto_block_encrypt if (!usedIv) { return APR_ENOMEM; } + apr_crypto_clear(p, usedIv, key->ivSize); if (!((RAND_status() == 1) && (RAND_bytes(usedIv, key->ivSize) == 1))) { return APR_ENOIV; @@ -575,6 +577,7 @@ static apr_status_t crypto_block_encrypt if (!buffer) { return APR_ENOMEM; } + apr_crypto_clear(ctx->pool, buffer, inlen + EVP_MAX_BLOCK_LENGTH); *out = buffer; } @@ -729,6 +732,7 @@ static apr_status_t crypto_block_decrypt if (!buffer) { return APR_ENOMEM; } + apr_crypto_clear(ctx->pool, buffer, inlen + EVP_MAX_BLOCK_LENGTH); *out = buffer; } Modified: apr/apr/trunk/include/apr_crypto.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_crypto.h?rev=1210524&r1=1210523&r2=1210524&view=diff ============================================================================== --- apr/apr/trunk/include/apr_crypto.h (original) +++ apr/apr/trunk/include/apr_crypto.h Mon Dec 5 16:51:07 2011 @@ -132,6 +132,17 @@ typedef struct apr_crypto_block_t apr_cr APR_DECLARE(apr_status_t) apr_crypto_init(apr_pool_t *pool); /** + * @brief Register a cleanup to zero out the buffer provided + * when the pool is cleaned up. + * + * @param pool - pool to register the cleanup + * @param buffer - buffer to zero out + * @param size - size of the buffer to zero out + */ +APR_DECLARE(apr_status_t) apr_crypto_clear(apr_pool_t *pool, void *buffer, + apr_size_t size); + +/** * @brief Get the driver struct for a name * * @param driver - pointer to driver struct.