X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Feap-tls.h;h=befd20335e5a90084858517e5dc42d994a9c09d7;hb=bdd34ab1f2f87acb23c6d92feee7354ac53005ff;hp=c74a831671faee87ef87749f4904044ec9c8f767;hpb=b2a4275ba78b07a4e47dcefb8c9bf2fd8456184a;p=ppp.git diff --git a/pppd/eap-tls.h b/pppd/eap-tls.h index c74a831..befd203 100644 --- a/pppd/eap-tls.h +++ b/pppd/eap-tls.h @@ -30,6 +30,8 @@ * */ +#include "pppdconf.h" + #ifndef __EAP_TLS_H__ #define __EAP_TLS_H__ @@ -44,6 +46,8 @@ #define EAP_TLS_MAX_LEN 65536 /* max eap tls packet size */ +struct tls_info; + struct eaptls_session { u_char *data; /* buffered data */ @@ -56,7 +60,6 @@ struct eaptls_session SSL *ssl; /* ssl connection */ BIO *from_ssl; BIO *into_ssl; - char peer[MAXWORDLEN]; /* peer name */ char peercertfile[MAXWORDLEN]; bool alert_sent; u_char alert_sent_desc; @@ -65,12 +68,12 @@ struct eaptls_session char rtx[EAP_TLS_MAX_LEN]; /* retransmission buffer */ int rtx_len; int mtu; /* unit mtu */ - bool client; + struct tls_info *info; }; SSL_CTX *eaptls_init_ssl(int init_server, char *cacertfile, char *capath, - char *certfile, char *peer_certfile, char *privkeyfile); + char *certfile, char *privkeyfile, char *pkcs12); int eaptls_init_ssl_server(eap_state * esp); int eaptls_init_ssl_client(eap_state * esp); void eaptls_free_session(struct eaptls_session *ets); @@ -83,14 +86,9 @@ void eaptls_retransmit(struct eaptls_session *ets, u_char ** outp); int get_eaptls_secret(int unit, char *client, char *server, char *clicertfile, char *servcertfile, char *cacertfile, - char *capath, char *pkfile, int am_server); - -#ifdef MPPE -#include "mppe.h" /* MPPE_MAX_KEY_LEN */ -extern u_char mppe_send_key[MPPE_MAX_KEY_LEN]; -extern u_char mppe_recv_key[MPPE_MAX_KEY_LEN]; -extern int mppe_keys_set; + char *capath, char *pkfile, char *pkcs12, int am_server); +#ifdef PPP_WITH_MPPE void eaptls_gen_mppe_keys(struct eaptls_session *ets, int client); #endif