pidgin/android/libpurple

ciphers cleanup: hmac - correctly set up after resetting state

2013-05-06, Tomasz Wasilczyk
822d515c34c9
Parents 5bc654243432
Children 4dddef9bd1e0
ciphers cleanup: hmac - correctly set up after resetting state
1 files changed, 11 insertions(+), 8 deletions(-)
  • +11 -8
    libpurple/ciphers/hmac.c
    • --- a/libpurple/ciphers/hmac.c Mon May 06 14:50:00 2013 +0200
    +++ b/libpurple/ciphers/hmac.c Mon May 06 15:50:09 2013 +0200
    @@ -30,7 +30,7 @@
    PurpleCipherContext *hash;
    char *name;
    int blocksize;
    - guchar *opad;
    + guchar *opad, *ipad;
    };
    static void
    @@ -57,6 +57,8 @@
    hctx->blocksize = 0;
    g_free(hctx->opad);
    hctx->opad = NULL;
    + g_free(hctx->ipad);
    + hctx->ipad = NULL;
    }
    static void
    @@ -66,8 +68,10 @@
    hctx = purple_cipher_context_get_data(context);
    - if (hctx->hash)
    - purple_cipher_context_reset_state(hctx->hash, extra);
    + if (hctx->hash) {
    + purple_cipher_context_reset_state(hctx->hash, NULL);
    + purple_cipher_context_append(hctx->hash, hctx->ipad, hctx->blocksize);
    + }
    }
    static void
    @@ -168,15 +172,15 @@
    {
    struct HMAC_Context *hctx = purple_cipher_context_get_data(context);
    int blocksize, i;
    - guchar *ipad;
    guchar *full_key;
    g_return_if_fail(hctx->hash != NULL);
    g_free(hctx->opad);
    + g_free(hctx->ipad);
    blocksize = hctx->blocksize;
    - ipad = g_malloc(blocksize);
    + hctx->ipad = g_malloc(blocksize);
    hctx->opad = g_malloc(blocksize);
    if (key_len > blocksize) {
    @@ -195,15 +199,14 @@
    }
    for(i = 0; i < blocksize; i++) {
    - ipad[i] = 0x36 ^ full_key[i];
    + hctx->ipad[i] = 0x36 ^ full_key[i];
    hctx->opad[i] = 0x5c ^ full_key[i];
    }
    g_free(full_key);
    purple_cipher_context_reset(hctx->hash, NULL);
    - purple_cipher_context_append(hctx->hash, ipad, blocksize);
    - g_free(ipad);
    + purple_cipher_context_append(hctx->hash, hctx->ipad, blocksize);
    }
    static size_t