Changeset 808 for openssl/trunk/ssl/s3_lib.c

Timestamp:

Aug 7, 2014, 8:25:37 PM (11 years ago)

Author:

dmik

Message:

openssl: Merge version 1.0.0n from vendor to trunk.

Location:

openssl/trunk

Files:

• . (modified) (1 prop)
• ssl/s3_lib.c (modified) (19 diffs)

openssl/trunk/ssl/s3_lib.c ¶

@@ -329 +329 @@
         SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-        168,
+        112,
         168,
         },
@@ -378 +378 @@
         SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-        168,
+        112,
         168,
         },
@@ -426 +426 @@
         SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-        168,
+        112,
         168,
         },
@@ -475 +475 @@
         SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-        168,
+        112,
         168,
         },
@@ -523 +523 @@
         SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-        168,
+        112,
         168,
         },
@@ -603 +603 @@
         SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-        168,
+        112,
         168,
         },
@@ -688 +688 @@
         SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-        168,
+        112,
         168,
         },
@@ -752 +752 @@
         SSL_NOT_EXP|SSL_HIGH,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-        168,
+        112,
         168,
         },
@@ -1473 +1473 @@
         SSL_NOT_EXP|SSL_HIGH,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-        168,
+        112,
         168,
         },
@@ -1656 +1656 @@
         SSL_NOT_EXP|SSL_HIGH,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-        168,
+        112,
         168,
         },
@@ -1736 +1736 @@
         SSL_NOT_EXP|SSL_HIGH,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-        168,
+        112,
         168,
         },
@@ -1816 +1816 @@
         SSL_NOT_EXP|SSL_HIGH,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-        168,
+        112,
         168,
         },
@@ -1896 +1896 @@
         SSL_NOT_EXP|SSL_HIGH,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-        168,
+        112,
         168,
         },
@@ -1976 +1976 @@
         SSL_NOT_EXP|SSL_HIGH,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-        168,
+        112,
         168,
         },
@@ -2178 +2178 @@
         unsigned char *rp,*wp;
         size_t rlen, wlen;
+        int init_extra;
 
 #ifdef TLSEXT_TYPE_opaque_prf_input
@@ -2199 +2200 @@
 #ifndef OPENSSL_NO_DH
         if (s->s3->tmp.dh != NULL)
+                {
                 DH_free(s->s3->tmp.dh);
+                s->s3->tmp.dh = NULL;
+                }
 #endif
 #ifndef OPENSSL_NO_ECDH
         if (s->s3->tmp.ecdh != NULL)
+                {
                 EC_KEY_free(s->s3->tmp.ecdh);
-#endif
+                s->s3->tmp.ecdh = NULL;
+                }
+#endif
+#ifndef OPENSSL_NO_TLSEXT
+#ifndef OPENSSL_NO_EC
+        s->s3->is_probably_safari = 0;
+#endif /* !OPENSSL_NO_EC */
+#endif /* !OPENSSL_NO_TLSEXT */
 
         rp = s->s3->rbuf.buf;
@@ -2210 +2222 @@
         rlen = s->s3->rbuf.len;
         wlen = s->s3->wbuf.len;
+        init_extra = s->s3->init_extra;
         if (s->s3->handshake_buffer) {
                 BIO_free(s->s3->handshake_buffer);
@@ -2222 +2235 @@
         s->s3->rbuf.len = rlen;
         s->s3->wbuf.len = wlen;
+        s->s3->init_extra = init_extra;
 
         ssl_free_wbio_buffer(s);
@@ -3075 +3089 @@
                 if (ii >= 0)
                         {
+#if !defined(OPENSSL_NO_EC) && !defined(OPENSSL_NO_TLSEXT)
+                        if ((alg_k & SSL_kEECDH) && (alg_a & SSL_aECDSA) && s->s3->is_probably_safari)
+                                {
+                                if (!ret) ret=sk_SSL_CIPHER_value(allow,ii);
+                                continue;
+                                }
+#endif
                         ret=sk_SSL_CIPHER_value(allow,ii);
                         break;