From 193c6001086920c0623593aba373f948aa275f8d Mon Sep 17 00:00:00 2001 From: mathewmarcus Date: Wed, 20 Jun 2018 09:06:45 -0500 Subject: [PATCH] moved struct ssl_decoder_ definition into header file because we need it in ssl.enums.c --- ssl/ssldecode.c | 17 ----------------- ssl/ssldecode.h | 19 ++++++++++++++++++- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ssl/ssldecode.c b/ssl/ssldecode.c index 08f96a6..e07cb2b 100644 --- a/ssl/ssldecode.c +++ b/ssl/ssldecode.c @@ -55,7 +55,6 @@ #include #endif #include "ssldecode.h" -#include "ssl_rec.h" #include "r_assoc.h" static char *RCSSTRING="$Id: ssldecode.c,v 1.9 2002/08/17 01:33:17 ekr Exp $"; @@ -82,22 +81,6 @@ struct ssl_decode_ctx_ { #endif }; -struct ssl_decoder_ { - ssl_decode_ctx *ctx; - Data *session_id; - SSL_CipherSuite *cs; - Data *client_random; - Data *server_random; - int ephemeral_rsa; - Data *PMS; - Data *MS; - Data *handshake_messages; - ssl_rec_decoder *c_to_s; - ssl_rec_decoder *s_to_c; - ssl_rec_decoder *c_to_s_n; - ssl_rec_decoder *s_to_c_n; -}; - #ifdef OPENSSL static int tls_P_hash PROTO_LIST((ssl_obj *ssl,Data *secret,Data *seed, diff --git a/ssl/ssldecode.h b/ssl/ssldecode.h index e47f836..b7442cf 100644 --- a/ssl/ssldecode.h +++ b/ssl/ssldecode.h @@ -43,13 +43,30 @@ ekr@rtfm.com Thu Apr 1 15:02:02 1999 */ - +#include "ssl_rec.h" #ifndef _ssldecode_h #define _ssldecode_h #define CRDUMP(a,b,c) P_(P_CR) {Data d; d.data=b; d.len=c; exdump(ssl,a,&d); printf("\n");} #define CRDUMPD(a,b) P_(P_CR) {exdump(ssl,a,b);printf("\n");} +struct ssl_decoder_ { + ssl_decode_ctx *ctx; + Data *session_id; + SSL_CipherSuite *cs; + Data *client_random; + Data *server_random; + int ephemeral_rsa; + Data *PMS; + Data *MS; + Data *handshake_messages; + int extended_master_secret; + ssl_rec_decoder *c_to_s; + ssl_rec_decoder *s_to_c; + ssl_rec_decoder *c_to_s_n; + ssl_rec_decoder *s_to_c_n; +}; + int ssl_decode_ctx_create PROTO_LIST((ssl_decode_ctx **ctx, char *keyfile,char *password)); int ssl_decoder_destroy PROTO_LIST((ssl_decoder **dp));