Option to set current cert to server certificate.

[openssl.git] / crypto / armcap.c

diff --git a/crypto/armcap.c b/crypto/armcap.c
index 74c2c5729595008a464c8ae6e4a3a92c393d6b8c..9abaf396e53e4f5f02a05639d66ccdd9cc023495 100644 (file)
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -23,12 +23,15 @@ unsigned int _armv7_tick(void);
 
 unsigned int OPENSSL_rdtsc(void)
        {
-       if (OPENSSL_armcap_P|ARMV7_TICK)
+       if (OPENSSL_armcap_P & ARMV7_TICK)
                return _armv7_tick();
        else
                return 0;
        }
 
+#if defined(__GNUC__) && __GNUC__>=2
+void OPENSSL_cpuid_setup(void) __attribute__((constructor));
+#endif
 void OPENSSL_cpuid_setup(void)
        {
        char *e;