From a04d78d392463df4e69a64360c952ffa5abd22f7 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Fri, 25 Sep 2015 00:26:37 +0000
Subject: Revert "external/boringssl: sync with upstream."

This reverts commit 1e4884f615b20946411a74e41eb9c6aa65e2d5f3.

This breaks some x86 builds.

Change-Id: I4d4310663ce52bc0a130e6b9dbc22b868ff4fb25
---
 src/ssl/ssl_stat.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 111 insertions(+), 3 deletions(-)

(limited to 'src/ssl/ssl_stat.c')

diff --git a/src/ssl/ssl_stat.c b/src/ssl/ssl_stat.c
index 5ad1e47..fa5541b 100644
--- a/src/ssl/ssl_stat.c
+++ b/src/ssl/ssl_stat.c
@@ -82,11 +82,9 @@
  * OTHERWISE.
  */
 
-#include <openssl/ssl.h>
-
+#include <stdio.h>
 #include "internal.h"
 
-
 const char *SSL_state_string_long(const SSL *s) {
   const char *str;
 
@@ -336,6 +334,37 @@ const char *SSL_state_string_long(const SSL *s) {
       str = "SSLv3 read certificate verify B";
       break;
 
+    /* SSLv2/v3 compatibility states */
+    /* client */
+    case SSL23_ST_CW_CLNT_HELLO_A:
+      str = "SSLv2/v3 write client hello A";
+      break;
+
+    case SSL23_ST_CW_CLNT_HELLO_B:
+      str = "SSLv2/v3 write client hello B";
+      break;
+
+    case SSL23_ST_CR_SRVR_HELLO_A:
+      str = "SSLv2/v3 read server hello A";
+      break;
+
+    case SSL23_ST_CR_SRVR_HELLO_B:
+      str = "SSLv2/v3 read server hello B";
+      break;
+
+    /* server */
+    case SSL23_ST_SR_CLNT_HELLO:
+      str = "SSLv2/v3 read client hello";
+      break;
+
+    case SSL23_ST_SR_V2_CLNT_HELLO:
+      str = "SSLv2/v3 read v2 client hello";
+      break;
+
+    case SSL23_ST_SR_SWITCH_VERSION:
+      str = "SSLv2/v3 switch version";
+      break;
+
     /* DTLS */
     case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A:
       str = "DTLS1 read hello verify request A";
@@ -353,6 +382,30 @@ const char *SSL_state_string_long(const SSL *s) {
   return str;
 }
 
+const char *SSL_rstate_string_long(const SSL *s) {
+  const char *str;
+
+  switch (s->rstate) {
+    case SSL_ST_READ_HEADER:
+      str = "read header";
+      break;
+
+    case SSL_ST_READ_BODY:
+      str = "read body";
+      break;
+
+    case SSL_ST_READ_DONE:
+      str = "read done";
+      break;
+
+    default:
+      str = "unknown";
+      break;
+  }
+
+  return str;
+}
+
 const char *SSL_state_string(const SSL *s) {
   const char *str;
 
@@ -582,6 +635,37 @@ const char *SSL_state_string(const SSL *s) {
       str = "3RCV_B";
       break;
 
+    /* SSLv2/v3 compatibility states */
+    /* client */
+    case SSL23_ST_CW_CLNT_HELLO_A:
+      str = "23WCHA";
+      break;
+
+    case SSL23_ST_CW_CLNT_HELLO_B:
+      str = "23WCHB";
+      break;
+
+    case SSL23_ST_CR_SRVR_HELLO_A:
+      str = "23RSHA";
+      break;
+
+    case SSL23_ST_CR_SRVR_HELLO_B:
+      str = "23RSHA";
+      break;
+
+    /* server */
+    case SSL23_ST_SR_CLNT_HELLO:
+      str = "23RCH_";
+      break;
+
+    case SSL23_ST_SR_V2_CLNT_HELLO:
+      str = "23R2CH";
+      break;
+
+    case SSL23_ST_SR_SWITCH_VERSION:
+      str = "23RSW_";
+      break;
+
     /* DTLS */
     case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A:
       str = "DRCHVA";
@@ -884,3 +968,27 @@ const char *SSL_alert_desc_string_long(int value) {
 
   return str;
 }
+
+const char *SSL_rstate_string(const SSL *s) {
+  const char *str;
+
+  switch (s->rstate) {
+    case SSL_ST_READ_HEADER:
+      str = "RH";
+      break;
+
+    case SSL_ST_READ_BODY:
+      str = "RB";
+      break;
+
+    case SSL_ST_READ_DONE:
+      str = "RD";
+      break;
+
+    default:
+      str = "unknown";
+      break;
+  }
+
+  return str;
+}
-- 
cgit v1.1