[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Andy Polyakov]

The branch OpenSSL_1_0_2-stable has been updated
       via  8d5d455988d66048ec5b84756581bc3f6f2e55dd (commit)
      from  1d5668c25806d4ed631c19c81081c93fc0571d82 (commit)


- Log -----------------------------------------------------------------
commit 8d5d455988d66048ec5b84756581bc3f6f2e55dd
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun Jan 25 14:51:43 2015 +0100

    modes/gcm128.c: fix OPENSSL_SMALL_FOOTPRINT compile failure
    on affected platforms (PowerPC and AArch64).
    
    For reference, minimalistic #ifdef GHASH is sufficient, because
    it's never defined with OPENSSL_SMALL_FOOTPRINT and ctx->ghash
    is never referred.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit b2991c081aba5351a3386bdde2927672d53e5c99)

-----------------------------------------------------------------------

Summary of changes:
 crypto/modes/gcm128.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c
index 4debf53..24a84a7 100644
--- a/crypto/modes/gcm128.c
+++ b/crypto/modes/gcm128.c
@@ -852,7 +852,11 @@ void CRYPTO_gcm128_init(GCM128_CONTEXT *ctx, void *key, block128_f block)
     {
         gcm_init_4bit(ctx->Htable, ctx->H.u);
         ctx->gmult = gcm_gmult_4bit;
+#  if defined(GHASH)
         ctx->ghash = gcm_ghash_4bit;
+#  else
+        ctx->ghash = NULL;
+#  endif
     }
 # elif  defined(GHASH_ASM_SPARC)
     if (OPENSSL_sparcv9cap_P[0] & SPARCV9_VIS3) {
@@ -872,7 +876,11 @@ void CRYPTO_gcm128_init(GCM128_CONTEXT *ctx, void *key, block128_f block)
     } else {
         gcm_init_4bit(ctx->Htable, ctx->H.u);
         ctx->gmult = gcm_gmult_4bit;
+#  if defined(GHASH)
         ctx->ghash = gcm_ghash_4bit;
+#  else
+        ctx->ghash = NULL;
+#  endif
     }
 # else
     gcm_init_4bit(ctx->Htable, ctx->H.u);