mirror of
https://github.com/adulau/ssldump.git
synced 2024-11-07 12:06:27 +00:00
Revert "moved struct ssl_decoder_ definition into header file because we need it in ssl.enums.c"
This reverts commit 193c600108
.
This commit is contained in:
parent
193c600108
commit
83627b7c8f
2 changed files with 18 additions and 18 deletions
|
@ -55,6 +55,7 @@
|
||||||
#include <openssl/x509v3.h>
|
#include <openssl/x509v3.h>
|
||||||
#endif
|
#endif
|
||||||
#include "ssldecode.h"
|
#include "ssldecode.h"
|
||||||
|
#include "ssl_rec.h"
|
||||||
#include "r_assoc.h"
|
#include "r_assoc.h"
|
||||||
static char *RCSSTRING="$Id: ssldecode.c,v 1.9 2002/08/17 01:33:17 ekr Exp $";
|
static char *RCSSTRING="$Id: ssldecode.c,v 1.9 2002/08/17 01:33:17 ekr Exp $";
|
||||||
|
|
||||||
|
@ -81,6 +82,22 @@ struct ssl_decode_ctx_ {
|
||||||
#endif
|
#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
|
#ifdef OPENSSL
|
||||||
static int tls_P_hash PROTO_LIST((ssl_obj *ssl,Data *secret,Data *seed,
|
static int tls_P_hash PROTO_LIST((ssl_obj *ssl,Data *secret,Data *seed,
|
||||||
|
|
|
@ -43,30 +43,13 @@
|
||||||
ekr@rtfm.com Thu Apr 1 15:02:02 1999
|
ekr@rtfm.com Thu Apr 1 15:02:02 1999
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ssl_rec.h"
|
|
||||||
#ifndef _ssldecode_h
|
#ifndef _ssldecode_h
|
||||||
#define _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 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");}
|
#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,
|
int ssl_decode_ctx_create PROTO_LIST((ssl_decode_ctx **ctx,
|
||||||
char *keyfile,char *password));
|
char *keyfile,char *password));
|
||||||
int ssl_decoder_destroy PROTO_LIST((ssl_decoder **dp));
|
int ssl_decoder_destroy PROTO_LIST((ssl_decoder **dp));
|
||||||
|
|
Loading…
Reference in a new issue