resolve conflicts, fix local changes

1 files changed, 61 insertions, 0 deletions

diff --git a/src/lib/libssl/ssl_stat.c b/src/lib/libssl/ssl_stat.c
index 73b02509d4..144b81e55f 100644
--- a/src/lib/libssl/ssl_stat.c
+++ b/src/lib/libssl/ssl_stat.c
@@ -55,6 +55,32 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
+/* ====================================================================
+ * Copyright 2005 Nokia. All rights reserved.
+ *
+ * The portions of the attached software ("Contribution") is developed by
+ * Nokia Corporation and is licensed pursuant to the OpenSSL open source
+ * license.
+ *
+ * The Contribution, originally written by Mika Kousa and Pasi Eronen of
+ * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
+ * support (see RFC 4279) to OpenSSL.
+ *
+ * No patent licenses or other rights except those expressly stated in
+ * the OpenSSL open source license shall be deemed granted or received
+ * expressly, by implication, estoppel, or otherwise.
+ *
+ * No assurances are provided by Nokia that the Contribution does not
+ * infringe the patent or other intellectual property rights of any third
+ * party or that the license provides you with all the necessary rights
+ * to make use of the Contribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
+ * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
+ * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
+ * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
+ * OTHERWISE.
+ */
 
 #include <stdio.h>
 #include "ssl_locl.h"
@@ -198,6 +224,12 @@ case SSL23_ST_SR_CLNT_HELLO_A:	str="SSLv2/v3 read client hello A"; break;
 case SSL23_ST_SR_CLNT_HELLO_B:  str="SSLv2/v3 read client hello B"; break;
 #endif
 
+/* DTLS */
+case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A: str="DTLS1 read hello verify request A"; break;
+case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B: str="DTLS1 read hello verify request B"; break;
+case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A: str="DTLS1 write hello verify request A"; break;
+case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B: str="DTLS1 write hello verify request B"; break;
+
 default:        str="unknown state"; break;
                 }
         return(str);
@@ -345,6 +377,11 @@ case SSL23_ST_CR_SRVR_HELLO_B:			str="23RSHA"; break;
 case SSL23_ST_SR_CLNT_HELLO_A:                  str="23RCHA"; break;
 case SSL23_ST_SR_CLNT_HELLO_B:                  str="23RCHB"; break;
 #endif
+/* DTLS */
+case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A: str="DRCHVA"; break;
+case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B: str="DRCHVB"; break;
+case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A: str="DWCHVA"; break;
+case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B: str="DWCHVB"; break;
 
 default:                                        str="UNKWN "; break;
                 }
@@ -403,6 +440,12 @@ const char *SSL_alert_desc_string(int value)
         case TLS1_AD_INTERNAL_ERROR:            str="IE"; break;
         case TLS1_AD_USER_CANCELLED:            str="US"; break;
         case TLS1_AD_NO_RENEGOTIATION:          str="NR"; break;
+        case TLS1_AD_UNSUPPORTED_EXTENSION:     str="UE"; break;
+        case TLS1_AD_CERTIFICATE_UNOBTAINABLE:  str="CO"; break;
+        case TLS1_AD_UNRECOGNIZED_NAME:         str="UN"; break;
+        case TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE: str="BR"; break;
+        case TLS1_AD_BAD_CERTIFICATE_HASH_VALUE: str="BH"; break;
+        case TLS1_AD_UNKNOWN_PSK_IDENTITY:      str="UP"; break;
         default:                                str="UK"; break;
                 }
         return(str);
@@ -486,6 +529,24 @@ const char *SSL_alert_desc_string_long(int value)
         case TLS1_AD_NO_RENEGOTIATION:
                 str="no renegotiation";
                 break;
+        case TLS1_AD_UNSUPPORTED_EXTENSION:
+                str="unsupported extension";
+                break;
+        case TLS1_AD_CERTIFICATE_UNOBTAINABLE:
+                str="certificate unobtainable";
+                break;
+        case TLS1_AD_UNRECOGNIZED_NAME:
+                str="unrecognized name";
+                break;
+        case TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE:
+                str="bad certificate status response";
+                break;
+        case TLS1_AD_BAD_CERTIFICATE_HASH_VALUE:
+                str="bad certificate hash value";
+                break;
+        case TLS1_AD_UNKNOWN_PSK_IDENTITY:
+                str="unknown PSK identity";
+                break;
         default: str="unknown"; break;
                 }
         return(str);