X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Feap-tls.h;h=d0c80b6030ff240b82c1467b73795d2a5975393a;hb=d2858ab22a536c8e58f7796b2947f5ff72bb4450;hp=cdbc9e4e4f9e90cf6139ea39b1eb13e75e0f581c;hpb=5ece6e68baaf9fdbd6e73daa7b27335f8852d85b;p=ppp.git

diff --git a/pppd/eap-tls.h b/pppd/eap-tls.h
index cdbc9e4..d0c80b6 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__
 
@@ -65,11 +67,12 @@ struct eaptls_session
     char rtx[EAP_TLS_MAX_LEN];  /* retransmission buffer */
     int rtx_len;
     int mtu;                    /* unit mtu */
+    bool client;
 };
 
 
 SSL_CTX *eaptls_init_ssl(int init_server, char *cacertfile, char *capath,
-            char *certfile, char *peer_certfile, char *privkeyfile);
+            char *certfile, char *peer_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);
@@ -82,14 +85,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);
+              char *capath, char *pkfile, char *pkcs12, 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;
-
 void eaptls_gen_mppe_keys(struct eaptls_session *ets, int client);
 #endif