- p=s->s3->client_random;
- Time=(unsigned long)time(NULL); /* Time */
- l2n(Time,p);
- if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)
- return -1;
-
- if (version == TLS1_VERSION)
- {
- version_major = TLS1_VERSION_MAJOR;
- version_minor = TLS1_VERSION_MINOR;
- }
- else if (version == SSL3_VERSION)
- {
- version_major = SSL3_VERSION_MAJOR;
- version_minor = SSL3_VERSION_MINOR;
- }
- else if (version == SSL2_VERSION)
- {
- version_major = SSL2_VERSION_MAJOR;
- version_minor = SSL2_VERSION_MINOR;
- }
- else
- {
- SSLerr(SSL_F_SSL23_CLIENT_HELLO,SSL_R_NO_PROTOCOLS_AVAILABLE);
- return(-1);
- }
-
- s->client_version = version;
-
- if (ssl2_compat)
- {
- /* create SSL 2.0 compatible Client Hello */
-
- /* two byte record header will be written last */
- d = &(buf[2]);
- p = d + 9; /* leave space for message type, version, individual length fields */
-
- *(d++) = SSL2_MT_CLIENT_HELLO;
- *(d++) = version_major;
- *(d++) = version_minor;
-
- /* Ciphers supported */
- i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),p,0);
- if (i == 0)
- {
- /* no ciphers */
- SSLerr(SSL_F_SSL23_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE);
- return -1;
- }
- s2n(i,d);
- p+=i;
-
- /* put in the session-id length (zero since there is no reuse) */
-#if 0
- s->session->session_id_length=0;
+ buf = (unsigned char *)s->init_buf->data;
+ if (s->state == SSL23_ST_CW_CLNT_HELLO_A) {
+ /*
+ * Since we're sending s23 client hello, we're not reusing a session, as
+ * we'd be using the method from the saved session instead
+ */
+ if (!ssl_get_new_session(s, 0)) {
+ return -1;
+ }
+
+ p = s->s3->client_random;
+ if (ssl_fill_hello_random(s, 0, p, SSL3_RANDOM_SIZE) <= 0)
+ return -1;
+
+ if (version == TLS1_2_VERSION) {
+ version_major = TLS1_2_VERSION_MAJOR;
+ version_minor = TLS1_2_VERSION_MINOR;
+ } else if (version == TLS1_1_VERSION) {
+ version_major = TLS1_1_VERSION_MAJOR;
+ version_minor = TLS1_1_VERSION_MINOR;
+ } else if (version == TLS1_VERSION) {
+ version_major = TLS1_VERSION_MAJOR;
+ version_minor = TLS1_VERSION_MINOR;
+ }
+#ifdef OPENSSL_FIPS
+ else if (FIPS_mode()) {
+ SSLerr(SSL_F_SSL23_CLIENT_HELLO,
+ SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
+ return -1;
+ }
+#endif
+ else if (version == SSL3_VERSION) {
+ version_major = SSL3_VERSION_MAJOR;
+ version_minor = SSL3_VERSION_MINOR;
+ } else if (version == SSL2_VERSION) {
+ version_major = SSL2_VERSION_MAJOR;
+ version_minor = SSL2_VERSION_MINOR;
+ } else {
+ SSLerr(SSL_F_SSL23_CLIENT_HELLO, SSL_R_NO_PROTOCOLS_AVAILABLE);
+ return (-1);
+ }
+
+ s->client_version = version;
+
+ if (ssl2_compat) {
+ /* create SSL 2.0 compatible Client Hello */
+
+ /* two byte record header will be written last */
+ d = &(buf[2]);
+ p = d + 9; /* leave space for message type, version,
+ * individual length fields */
+
+ *(d++) = SSL2_MT_CLIENT_HELLO;
+ *(d++) = version_major;
+ *(d++) = version_minor;
+
+ /* Ciphers supported */
+ i = ssl_cipher_list_to_bytes(s, SSL_get_ciphers(s), p, 0);
+ if (i == 0) {
+ /* no ciphers */
+ SSLerr(SSL_F_SSL23_CLIENT_HELLO, SSL_R_NO_CIPHERS_AVAILABLE);
+ return -1;
+ }
+ s2n(i, d);
+ p += i;
+
+ /*
+ * put in the session-id length (zero since there is no reuse)
+ */
+ s2n(0, d);
+
+ if (s->options & SSL_OP_NETSCAPE_CHALLENGE_BUG)
+ ch_len = SSL2_CHALLENGE_LENGTH;
+ else
+ ch_len = SSL2_MAX_CHALLENGE_LENGTH;
+
+ /* write out sslv2 challenge */
+ /*
+ * Note that ch_len must be <= SSL3_RANDOM_SIZE (32), because it
+ * is one of SSL2_MAX_CHALLENGE_LENGTH (32) or
+ * SSL2_MAX_CHALLENGE_LENGTH (16), but leave the check in for
+ * futurproofing
+ */
+ if (SSL3_RANDOM_SIZE < ch_len)
+ i = SSL3_RANDOM_SIZE;
+ else
+ i = ch_len;
+ s2n(i, d);
+ memset(&(s->s3->client_random[0]), 0, SSL3_RANDOM_SIZE);
+ if (RAND_pseudo_bytes
+ (&(s->s3->client_random[SSL3_RANDOM_SIZE - i]), i) <= 0)
+ return -1;
+
+ memcpy(p, &(s->s3->client_random[SSL3_RANDOM_SIZE - i]), i);
+ p += i;
+
+ i = p - &(buf[2]);
+ buf[0] = ((i >> 8) & 0xff) | 0x80;
+ buf[1] = (i & 0xff);
+
+ /* number of bytes to write */
+ s->init_num = i + 2;
+ s->init_off = 0;
+
+ ssl3_finish_mac(s, &(buf[2]), i);
+ } else {
+ /* create Client Hello in SSL 3.0/TLS 1.0 format */
+
+ /*
+ * do the record header (5 bytes) and handshake message header (4
+ * bytes) last
+ */
+ d = p = &(buf[9]);
+
+ *(p++) = version_major;
+ *(p++) = version_minor;
+
+ /* Random stuff */
+ memcpy(p, s->s3->client_random, SSL3_RANDOM_SIZE);
+ p += SSL3_RANDOM_SIZE;
+
+ /* Session ID (zero since there is no reuse) */
+ *(p++) = 0;
+
+ /* Ciphers supported (using SSL 3.0/TLS 1.0 format) */
+ i = ssl_cipher_list_to_bytes(s, SSL_get_ciphers(s), &(p[2]),
+ ssl3_put_cipher_by_char);
+ if (i == 0) {
+ SSLerr(SSL_F_SSL23_CLIENT_HELLO, SSL_R_NO_CIPHERS_AVAILABLE);
+ return -1;
+ }
+#ifdef OPENSSL_MAX_TLS1_2_CIPHER_LENGTH
+ /*
+ * Some servers hang if client hello > 256 bytes as hack
+ * workaround chop number of supported ciphers to keep it well
+ * below this if we use TLS v1.2
+ */
+ if (TLS1_get_version(s) >= TLS1_2_VERSION
+ && i > OPENSSL_MAX_TLS1_2_CIPHER_LENGTH)
+ i = OPENSSL_MAX_TLS1_2_CIPHER_LENGTH & ~1;