diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2012-02-22 14:01:44 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2012-02-22 14:01:44 +0000 |
commit | f1fa05b4070ff237ff7d6a6ef123024a396a19c8 (patch) | |
tree | 2651837586cfec35e87a37d0d9ae77e62b7c64d7 /ssl/ssl3.h | |
parent | 02e22c35feafb9eea75cce7fb112045864647df5 (diff) |
ABI compliance fixes.
Move new structure fields to end of structures.
Import library codes from 1.0.0 and recreate new ones.
Diffstat (limited to 'ssl/ssl3.h')
-rw-r--r-- | ssl/ssl3.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ssl/ssl3.h b/ssl/ssl3.h index badf89d3d9..112e627de0 100644 --- a/ssl/ssl3.h +++ b/ssl/ssl3.h @@ -477,11 +477,6 @@ typedef struct ssl3_state_st void *server_opaque_prf_input; size_t server_opaque_prf_input_len; -#ifndef OPENSSL_NO_NEXTPROTONEG - /* Set if we saw the Next Protocol Negotiation extension from our peer. */ - int next_proto_neg_seen; -#endif - struct { /* actually only needs to be 16+20 */ unsigned char cert_verify_md[EVP_MAX_MD_SIZE*2]; @@ -539,6 +534,11 @@ typedef struct ssl3_state_st unsigned char previous_server_finished[EVP_MAX_MD_SIZE]; unsigned char previous_server_finished_len; int send_connection_binding; /* TODOEKR */ + +#ifndef OPENSSL_NO_NEXTPROTONEG + /* Set if we saw the Next Protocol Negotiation extension from our peer. */ + int next_proto_neg_seen; +#endif } SSL3_STATE; #endif |