[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  53385e1fee6e53043ba36d9c414b0387a4f87cd7 (commit)
       via  fa79c543d28c3543b3fcaa8adf5fe3d43cdba1c8 (commit)
      from  10a57adc606b86949007c076336e74970c2f336f (commit)


- Log -----------------------------------------------------------------
commit 53385e1fee6e53043ba36d9c414b0387a4f87cd7
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Apr 27 15:46:05 2016 +0200

    crypto/ppccap.c: fix missing declaration warning.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

commit fa79c543d28c3543b3fcaa8adf5fe3d43cdba1c8
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Apr 27 15:42:36 2016 +0200

    crypto/ppccap.c: permit build with no-chacha and no-poly1305.
    
    RT#4508
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/ppccap.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index 2c98daf..50c111a 100644
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -79,6 +79,7 @@ void sha512_block_data_order(void *ctx, const void *inp, size_t len)
         sha512_block_ppc(ctx, inp, len);
 }
 
+#ifndef OPENSSL_NO_CHACHA
 void ChaCha20_ctr32_int(unsigned char *out, const unsigned char *inp,
                         size_t len, const unsigned int key[8],
                         const unsigned int counter[4]);
@@ -93,7 +94,9 @@ void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp,
         ? ChaCha20_ctr32_vmx(out, inp, len, key, counter)
         : ChaCha20_ctr32_int(out, inp, len, key, counter);
 }
+#endif
 
+#ifndef OPENSSL_NO_POLY1305
 void poly1305_init_int(void *ctx, const unsigned char key[16]);
 void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
                          unsigned int padbit);
@@ -117,6 +120,7 @@ int poly1305_init(void *ctx, const unsigned char key[16], void *func[2])
     }
     return 1;
 }
+#endif
 
 static sigjmp_buf ill_jmp;
 static void ill_handler(int sig)
@@ -128,6 +132,7 @@ void OPENSSL_fpu_probe(void);
 void OPENSSL_ppc64_probe(void);
 void OPENSSL_altivec_probe(void);
 void OPENSSL_crypto207_probe(void);
+void OPENSSL_madd300_probe(void);
 
 /*
  * Use a weak reference to getauxval() so we can use it if it is available