[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  795e1231738ccebecfa031ecc4da75fcdd4ffc0a (commit)
      from  31305cdf9f5648a18c5a12854b08df7c9e4069fc (commit)


- Log -----------------------------------------------------------------
commit 795e1231738ccebecfa031ecc4da75fcdd4ffc0a
Author: Rich Salz <rsalz at akamai.com>
Date:   Sun Feb 14 16:15:41 2016 -0500

    Don't call cpuid in test; done as init.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 test/rc4test.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/test/rc4test.c b/test/rc4test.c
index 68f1641..7de091c 100644
--- a/test/rc4test.c
+++ b/test/rc4test.c
@@ -120,12 +120,6 @@ int main(int argc, char *argv[])
     RC4_KEY key;
     unsigned char obuf[512];
 
-# if !defined(OPENSSL_PIC)
-    void OPENSSL_cpuid_setup(void);
-
-    OPENSSL_cpuid_setup();
-# endif
-
     for (i = 0; i < 6; i++) {
         RC4_set_key(&key, keys[i][0], &(keys[i][1]));
         memset(obuf, 0, sizeof(obuf));