Currently, ssl3_put_char_by_bytes(NULL, NULL) is just a long handed way

of writing "2". Add a define for the SSL3_CIPHER_VALUE_SIZE (rather than
using a less-readable hardcoded constant everywhere) and replace the
ssl3_put_char_by_bytes(NULL, NULL) calls with it.

ok bcook@ miod@

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index 63e8135185..848de8c268 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_clnt.c,v 1.86 2014/08/10 14:42:56 jsing Exp $ */
+/* $OpenBSD: s3_clnt.c,v 1.87 2014/08/11 01:10:42 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -904,7 +904,7 @@ ssl3_get_server_hello(SSL *s)
                     SSL_R_WRONG_CIPHER_RETURNED);
                 goto f_err;
         }
-        p += ssl3_put_cipher_by_char(NULL, NULL);
+        p += SSL3_CIPHER_VALUE_SIZE;
 
         sk = ssl_get_ciphers_by_id(s);
         i = sk_SSL_CIPHER_find(sk, c);