From 6aa7fb8de2a73e7910f9742546ee13bc148a6fe1 Mon Sep 17 00:00:00 2001
From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Sat, 30 May 2009 19:53:49 +0000
Subject: Fixed issue of symbol conflicts interfering with Windows CryptoAPI
 functionality (Alon Bar-Lev).

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@4475 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 ssl.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ssl.c')

diff --git a/ssl.c b/ssl.c
index 37dcfe0..292a554 100644
--- a/ssl.c
+++ b/ssl.c
@@ -1716,8 +1716,8 @@ state_name (int state)
       return "S_GOT_KEY";
     case S_ACTIVE:
       return "S_ACTIVE";
-    case S_NORMAL:
-      return "S_NORMAL";
+    case S_NORMAL_OP:
+      return "S_NORMAL_OP";
     case S_ERROR:
       return "S_ERROR";
     default:
@@ -3642,8 +3642,8 @@ tls_process (struct tls_multi *multi,
 		}
 	      else /* assume that ks->state == S_ACTIVE */
 		{
-		  dmsg (D_TLS_DEBUG_MED, "STATE S_NORMAL");
-		  ks->state = S_NORMAL;
+		  dmsg (D_TLS_DEBUG_MED, "STATE S_NORMAL_OP");
+		  ks->state = S_NORMAL_OP;
 		  ks->must_negotiate = 0;
 		}
 	    }
-- 
cgit