From 668fed47964da20712f857752016a036db739b69 Mon Sep 17 00:00:00 2001
From: toddouska <todd@wolfssl.com>
Date: Thu, 2 Oct 2014 10:18:11 -0700
Subject: [PATCH] don't allow scr and fake indication together

---
 .gitignore     | 1 +
 configure.ac   | 4 ++++
 src/internal.c | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/.gitignore b/.gitignore
index 25b8b71d8..e40a82164 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.lo
 *.la
 *.o
+*.patch
 *.deps
 *.libs
 *.cache
diff --git a/configure.ac b/configure.ac
index 415aab035..c2a0499d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1342,6 +1342,10 @@ AC_ARG_ENABLE([secure-renegotiation],
 
 if test "x$ENABLED_SECURE_RENEGOTIATION" = "xyes"
 then
+    if test "x$ENABLED_RENEGOTIATION_INDICATION" = "xyes"
+    then
+        AC_MSG_ERROR([cannot enable renegotiation-indication and secure-renegotiation.])
+    fi
     AM_CFLAGS="$AM_CFLAGS -DHAVE_TLS_EXTENSIONS -DHAVE_SECURE_RENEGOTIATION"
 fi
 
diff --git a/src/internal.c b/src/internal.c
index 02faec4d2..0b8fb43df 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -63,6 +63,10 @@
 CYASSL_CALLBACKS needs LARGE_STATIC_BUFFERS, please add LARGE_STATIC_BUFFERS
 #endif
 
+#if defined(HAVE_SECURE_RENEGOTIATION) && defined(HAVE_RENEGOTIATION_INDICATION)
+    #error Cannot use both secure-renegotiation and renegotiation-indication
+#endif
+
 static int BuildMessage(CYASSL* ssl, byte* output, int outSz,
                         const byte* input, int inSz, int type);