From 0fa0c9fb7d6f4ad7a423044f28b55eaaedc63f28 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@cvs.openbsd.org>
Date: Tue, 27 Jun 2006 05:07:04 +0000
Subject: resolve conflicts

---
 lib/libcrypto/dh/dh.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib/libcrypto/dh/dh.h')

diff --git a/lib/libcrypto/dh/dh.h b/lib/libcrypto/dh/dh.h
index 0aff7fe21f9..8562d16fb70 100644
--- a/lib/libcrypto/dh/dh.h
+++ b/lib/libcrypto/dh/dh.h
@@ -70,7 +70,14 @@
 #include <openssl/crypto.h>
 #include <openssl/ossl_typ.h>
 	
-#define DH_FLAG_CACHE_MONT_P	0x01
+#define DH_FLAG_CACHE_MONT_P     0x01
+#define DH_FLAG_NO_EXP_CONSTTIME 0x02 /* new with 0.9.7h; the built-in DH
+                                       * implementation now uses constant time
+                                       * modular exponentiation for secret exponents
+                                       * by default. This flag causes the
+                                       * faster variable sliding window method to
+                                       * be used for all exponents.
+                                       */
 
 #ifdef  __cplusplus
 extern "C" {
-- 
cgit v1.2.3