From: Andy Polyakov <appro@openssl.org>
Date: Sun, 15 Sep 2013 20:07:49 +0000 (+0200)
Subject: crypto/armcap.c: fix typo in rdtsc subroutine.
X-Git-Tag: OpenSSL_1_0_2-beta1~282
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c340c7a88c84bf7d02143f5705b4cc5726c48e25;p=oweals%2Fopenssl.git

crypto/armcap.c: fix typo in rdtsc subroutine.

PR: 3125
Submitted by: Kyle McMartin
(cherry picked from commit 8e52a9063a8a016bdac780005256994d26f9c2f9)
---

diff --git a/crypto/armcap.c b/crypto/armcap.c
index 5258d2fbdd..9abaf396e5 100644
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -23,7 +23,7 @@ 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;