Remove now-unused SSL2_STATE as well as ssl2-specific state machine values.
authormiod <miod@openbsd.org>
Mon, 11 Aug 2014 04:45:19 +0000 (04:45 +0000)
committermiod <miod@openbsd.org>
Mon, 11 Aug 2014 04:45:19 +0000 (04:45 +0000)
ok guenther@ jsing@

lib/libssl/src/ssl/ssl2.h
lib/libssl/ssl2.h

index 011ed2b..5604f89 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl2.h,v 1.10 2014/06/12 15:49:31 deraadt Exp $ */
+/* $OpenBSD: ssl2.h,v 1.11 2014/08/11 04:45:19 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -147,122 +147,6 @@ extern "C" {
 #define SSL2_MIN_CERT_CHALLENGE_LENGTH 16
 #define SSL2_MAX_KEY_MATERIAL_LENGTH   24
 
-#ifndef HEADER_SSL_LOCL_H
-#define  CERT          char
-#endif
-
-#ifndef OPENSSL_NO_SSL_INTERN
-
-typedef struct ssl2_state_st {
-       int three_byte_header;
-       int clear_text;         /* clear text */
-       int escape;             /* not used in SSLv2 */
-       int ssl2_rollback;      /* used if SSLv23 rolled back to SSLv2 */
-
-       /* non-blocking io info, used to make sure the same
-        * args were passwd */
-       unsigned int wnum;      /* number of bytes sent so far */
-       int wpend_tot;
-       const unsigned char *wpend_buf;
-
-       int wpend_off;  /* offset to data to write */
-       int wpend_len;  /* number of bytes passwd to write */
-       int wpend_ret;  /* number of bytes to return to caller */
-
-       /* buffer raw data */
-       int rbuf_left;
-       int rbuf_offs;
-       unsigned char *rbuf;
-       unsigned char *wbuf;
-
-       unsigned char *write_ptr;/* used to point to the start due to
-                                 * 2/3 byte header. */
-
-       unsigned int padding;
-       unsigned int rlength; /* passed to ssl2_enc */
-       int ract_data_length; /* Set when things are encrypted. */
-       unsigned int wlength; /* passed to ssl2_enc */
-       int wact_data_length; /* Set when things are decrypted. */
-       unsigned char *ract_data;
-       unsigned char *wact_data;
-       unsigned char *mac_data;
-
-       unsigned char *read_key;
-       unsigned char *write_key;
-
-       /* Stuff specifically to do with this SSL session */
-       unsigned int challenge_length;
-       unsigned char challenge[SSL2_MAX_CHALLENGE_LENGTH];
-       unsigned int conn_id_length;
-       unsigned char conn_id[SSL2_MAX_CONNECTION_ID_LENGTH];
-       unsigned int key_material_length;
-       unsigned char key_material[SSL2_MAX_KEY_MATERIAL_LENGTH*2];
-
-       unsigned long read_sequence;
-       unsigned long write_sequence;
-
-       struct {
-               unsigned int conn_id_length;
-               unsigned int cert_type;
-
-               unsigned int cert_length;
-               unsigned int csl;
-
-               unsigned int clear;
-               unsigned int enc;
-
-               unsigned char ccl[SSL2_MAX_CERT_CHALLENGE_LENGTH];
-               unsigned int cipher_spec_length;
-               unsigned int session_id_length;
-               unsigned int clen;
-               unsigned int rlen;
-       } tmp;
-} SSL2_STATE;
-
-#endif
-
-/* SSLv2 */
-/* client */
-#define SSL2_ST_SEND_CLIENT_HELLO_A            (0x10|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_HELLO_B            (0x11|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_HELLO_A             (0x20|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_HELLO_B             (0x21|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_MASTER_KEY_A       (0x30|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_MASTER_KEY_B       (0x31|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_FINISHED_A         (0x40|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_FINISHED_B         (0x41|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_A      (0x50|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_B      (0x51|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_C      (0x52|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_D      (0x53|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_VERIFY_A            (0x60|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_VERIFY_B            (0x61|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_FINISHED_A          (0x70|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_FINISHED_B          (0x71|SSL_ST_CONNECT)
-#define SSL2_ST_CLIENT_START_ENCRYPTION                (0x80|SSL_ST_CONNECT)
-#define SSL2_ST_X509_GET_CLIENT_CERTIFICATE    (0x90|SSL_ST_CONNECT)
-/* server */
-#define SSL2_ST_GET_CLIENT_HELLO_A             (0x10|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_HELLO_B             (0x11|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_HELLO_C             (0x12|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_HELLO_A            (0x20|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_HELLO_B            (0x21|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_MASTER_KEY_A                (0x30|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_MASTER_KEY_B                (0x31|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_VERIFY_A           (0x40|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_VERIFY_B           (0x41|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_VERIFY_C           (0x42|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_FINISHED_A          (0x50|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_FINISHED_B          (0x51|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_FINISHED_A         (0x60|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_FINISHED_B         (0x61|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_A     (0x70|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_B     (0x71|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_C     (0x72|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_D     (0x73|SSL_ST_ACCEPT)
-#define SSL2_ST_SERVER_START_ENCRYPTION                (0x80|SSL_ST_ACCEPT)
-#define SSL2_ST_X509_GET_SERVER_CERTIFICATE    (0x90|SSL_ST_ACCEPT)
-
 #ifdef  __cplusplus
 }
 #endif
index 011ed2b..5604f89 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl2.h,v 1.10 2014/06/12 15:49:31 deraadt Exp $ */
+/* $OpenBSD: ssl2.h,v 1.11 2014/08/11 04:45:19 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -147,122 +147,6 @@ extern "C" {
 #define SSL2_MIN_CERT_CHALLENGE_LENGTH 16
 #define SSL2_MAX_KEY_MATERIAL_LENGTH   24
 
-#ifndef HEADER_SSL_LOCL_H
-#define  CERT          char
-#endif
-
-#ifndef OPENSSL_NO_SSL_INTERN
-
-typedef struct ssl2_state_st {
-       int three_byte_header;
-       int clear_text;         /* clear text */
-       int escape;             /* not used in SSLv2 */
-       int ssl2_rollback;      /* used if SSLv23 rolled back to SSLv2 */
-
-       /* non-blocking io info, used to make sure the same
-        * args were passwd */
-       unsigned int wnum;      /* number of bytes sent so far */
-       int wpend_tot;
-       const unsigned char *wpend_buf;
-
-       int wpend_off;  /* offset to data to write */
-       int wpend_len;  /* number of bytes passwd to write */
-       int wpend_ret;  /* number of bytes to return to caller */
-
-       /* buffer raw data */
-       int rbuf_left;
-       int rbuf_offs;
-       unsigned char *rbuf;
-       unsigned char *wbuf;
-
-       unsigned char *write_ptr;/* used to point to the start due to
-                                 * 2/3 byte header. */
-
-       unsigned int padding;
-       unsigned int rlength; /* passed to ssl2_enc */
-       int ract_data_length; /* Set when things are encrypted. */
-       unsigned int wlength; /* passed to ssl2_enc */
-       int wact_data_length; /* Set when things are decrypted. */
-       unsigned char *ract_data;
-       unsigned char *wact_data;
-       unsigned char *mac_data;
-
-       unsigned char *read_key;
-       unsigned char *write_key;
-
-       /* Stuff specifically to do with this SSL session */
-       unsigned int challenge_length;
-       unsigned char challenge[SSL2_MAX_CHALLENGE_LENGTH];
-       unsigned int conn_id_length;
-       unsigned char conn_id[SSL2_MAX_CONNECTION_ID_LENGTH];
-       unsigned int key_material_length;
-       unsigned char key_material[SSL2_MAX_KEY_MATERIAL_LENGTH*2];
-
-       unsigned long read_sequence;
-       unsigned long write_sequence;
-
-       struct {
-               unsigned int conn_id_length;
-               unsigned int cert_type;
-
-               unsigned int cert_length;
-               unsigned int csl;
-
-               unsigned int clear;
-               unsigned int enc;
-
-               unsigned char ccl[SSL2_MAX_CERT_CHALLENGE_LENGTH];
-               unsigned int cipher_spec_length;
-               unsigned int session_id_length;
-               unsigned int clen;
-               unsigned int rlen;
-       } tmp;
-} SSL2_STATE;
-
-#endif
-
-/* SSLv2 */
-/* client */
-#define SSL2_ST_SEND_CLIENT_HELLO_A            (0x10|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_HELLO_B            (0x11|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_HELLO_A             (0x20|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_HELLO_B             (0x21|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_MASTER_KEY_A       (0x30|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_MASTER_KEY_B       (0x31|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_FINISHED_A         (0x40|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_FINISHED_B         (0x41|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_A      (0x50|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_B      (0x51|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_C      (0x52|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_D      (0x53|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_VERIFY_A            (0x60|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_VERIFY_B            (0x61|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_FINISHED_A          (0x70|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_FINISHED_B          (0x71|SSL_ST_CONNECT)
-#define SSL2_ST_CLIENT_START_ENCRYPTION                (0x80|SSL_ST_CONNECT)
-#define SSL2_ST_X509_GET_CLIENT_CERTIFICATE    (0x90|SSL_ST_CONNECT)
-/* server */
-#define SSL2_ST_GET_CLIENT_HELLO_A             (0x10|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_HELLO_B             (0x11|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_HELLO_C             (0x12|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_HELLO_A            (0x20|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_HELLO_B            (0x21|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_MASTER_KEY_A                (0x30|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_MASTER_KEY_B                (0x31|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_VERIFY_A           (0x40|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_VERIFY_B           (0x41|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_VERIFY_C           (0x42|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_FINISHED_A          (0x50|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_FINISHED_B          (0x51|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_FINISHED_A         (0x60|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_FINISHED_B         (0x61|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_A     (0x70|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_B     (0x71|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_C     (0x72|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_D     (0x73|SSL_ST_ACCEPT)
-#define SSL2_ST_SERVER_START_ENCRYPTION                (0x80|SSL_ST_ACCEPT)
-#define SSL2_ST_X509_GET_SERVER_CERTIFICATE    (0x90|SSL_ST_ACCEPT)
-
 #ifdef  __cplusplus
 }
 #endif