commit b83003ebc62d9683b2ebdb119fb9c63f4271c171
author David Benjamin <davidben@chromium.org> Wed Dec 30 17:39:26 2015 -0500
committer Adam Langley <alangley@gmail.com> Wed Jan 27 21:38:12 2016 +0000
tree 921afa6732f4fb31508acd9ba2ab7b8feefdf6ad
parent a565d29ce65c7a3ae8083f31e58b131eb35c0add

Don't initialize enc_method before version negotiation.

Move it into ssl->s3 so it automatically behaves correctly on SSL_clear.
ssl->version is still a mess though.

Change-Id: I17a692a04a845886ec4f8de229fa6cf99fa7e24a
Reviewed-on: https://boringssl-review.googlesource.com/6844
Reviewed-by: Adam Langley <alangley@gmail.com>

ssl/s3_srvr.c

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index bbe178f..ae709dc 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -871,8 +871,8 @@
       goto f_err;
     }
     ssl->version = version;
-    ssl->enc_method = ssl3_get_enc_method(version);
-    assert(ssl->enc_method != NULL);
+    ssl->s3->enc_method = ssl3_get_enc_method(version);
+    assert(ssl->s3->enc_method != NULL);
     /* At this point, the connection's version is known and |ssl->version| is
      * fixed. Begin enforcing the record-layer version. */
     ssl->s3->have_version = 1;