diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2009-05-30 19:53:49 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2009-05-30 19:53:49 +0000 |
| commit | 6aa7fb8de2a73e7910f9742546ee13bc148a6fe1 (patch) | |
| tree | f156472f6a7f7930e287339c9c10a952cc8a8241 /ssl.c | |
| parent | 775a6ac2796a55bad3489d8532fd138d232fd2c4 (diff) | |
| download | openvpn-6aa7fb8de2a73e7910f9742546ee13bc148a6fe1.tar.gz openvpn-6aa7fb8de2a73e7910f9742546ee13bc148a6fe1.tar.xz openvpn-6aa7fb8de2a73e7910f9742546ee13bc148a6fe1.zip | |
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
Diffstat (limited to 'ssl.c')
| -rw-r--r-- | ssl.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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; } } |