X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fauth.c;h=fc2839009c35d0c76836d15f3ece65208b4bf9c9;hb=607d8eadccfd62c1fa84a36bd1440bd48b4e55ca;hp=601241f18164a576f01496755b7725a9c6e6fb24;hpb=505ec5cbd15ec23ed84282462ae9e451a1978133;p=ppp.git diff --git a/pppd/auth.c b/pppd/auth.c index 601241f..fc28390 100644 --- a/pppd/auth.c +++ b/pppd/auth.c @@ -70,6 +70,10 @@ #define RCSID "$Id: auth.c,v 1.117 2008/07/01 12:27:56 paulus Exp $" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include @@ -93,7 +97,7 @@ #include -#ifdef HAS_SHADOW +#ifdef HAVE_SHADOW_H #include #ifndef PW_PPP #define PW_PPP PW_LOGIN @@ -101,6 +105,10 @@ #endif #include +#ifdef HAVE_CRYPT_H +#include +#endif + #ifdef SYSTEMD #include #endif @@ -114,10 +122,10 @@ #include "upap.h" #include "chap-new.h" #include "eap.h" -#ifdef USE_EAPTLS +#ifdef PPP_WITH_EAPTLS #include "eap-tls.h" #endif -#ifdef CBCP_SUPPORT +#ifdef PPP_WITH_CBCP #include "cbcp.h" #endif #include "pathnames.h" @@ -168,43 +176,43 @@ static int passwd_from_file; static bool default_auth; /* Hook to enable a plugin to control the idle time limit */ -int (*idle_time_hook) __P((struct ppp_idle *)) = NULL; +int (*idle_time_hook)(struct ppp_idle *) = NULL; /* Hook for a plugin to say whether we can possibly authenticate any peer */ -int (*pap_check_hook) __P((void)) = NULL; +int (*pap_check_hook)(void) = NULL; /* Hook for a plugin to check the PAP user and password */ -int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp, - struct wordlist **paddrs, - struct wordlist **popts)) = NULL; +int (*pap_auth_hook)(char *user, char *passwd, char **msgp, + struct wordlist **paddrs, + struct wordlist **popts) = NULL; /* Hook for a plugin to know about the PAP user logout */ -void (*pap_logout_hook) __P((void)) = NULL; +void (*pap_logout_hook)(void) = NULL; /* Hook for a plugin to get the PAP password for authenticating us */ -int (*pap_passwd_hook) __P((char *user, char *passwd)) = NULL; +int (*pap_passwd_hook)(char *user, char *passwd) = NULL; /* Hook for a plugin to say if we can possibly authenticate a peer using CHAP */ -int (*chap_check_hook) __P((void)) = NULL; +int (*chap_check_hook)(void) = NULL; /* Hook for a plugin to get the CHAP password for authenticating us */ -int (*chap_passwd_hook) __P((char *user, char *passwd)) = NULL; +int (*chap_passwd_hook)(char *user, char *passwd) = NULL; -#ifdef USE_EAPTLS +#ifdef PPP_WITH_EAPTLS /* Hook for a plugin to get the EAP-TLS password for authenticating us */ -int (*eaptls_passwd_hook) __P((char *user, char *passwd)) = NULL; +int (*eaptls_passwd_hook)(char *user, char *passwd) = NULL; #endif /* Hook for a plugin to say whether it is OK if the peer refuses to authenticate. */ -int (*null_auth_hook) __P((struct wordlist **paddrs, - struct wordlist **popts)) = NULL; +int (*null_auth_hook)(struct wordlist **paddrs, + struct wordlist **popts) = NULL; -int (*allowed_address_hook) __P((u_int32_t addr)) = NULL; +int (*allowed_address_hook)(u_int32_t addr) = NULL; -#ifdef HAVE_MULTILINK +#ifdef PPP_WITH_MULTILINK /* Hook for plugin to hear when an interface joins a multilink bundle */ -void (*multilink_join_hook) __P((void)) = NULL; +void (*multilink_join_hook)(void) = NULL; #endif /* A notifier for when the peer has authenticated itself, @@ -236,7 +244,7 @@ bool cryptpap = 0; /* Passwords in pap-secrets are encrypted */ bool refuse_pap = 0; /* Don't wanna auth. ourselves with PAP */ bool refuse_chap = 0; /* Don't wanna auth. ourselves with CHAP */ bool refuse_eap = 0; /* Don't wanna auth. ourselves with EAP */ -#ifdef CHAPMS +#ifdef PPP_WITH_CHAPMS bool refuse_mschap = 0; /* Don't wanna auth. ourselves with MS-CHAP */ bool refuse_mschap_v2 = 0; /* Don't wanna auth. ourselves with MS-CHAPv2 */ #else @@ -250,64 +258,66 @@ bool explicit_remote = 0; /* User specified explicit remote name */ bool explicit_user = 0; /* Set if "user" option supplied */ bool explicit_passwd = 0; /* Set if "password" option supplied */ char remote_name[MAXNAMELEN]; /* Peer's name for authentication */ -#ifdef USE_EAPTLS -char *cacert_file = NULL; /* CA certificate file (pem format) */ -char *ca_path = NULL; /* directory with CA certificates */ -char *cert_file = NULL; /* client certificate file (pem format) */ -char *privkey_file = NULL; /* client private key file (pem format) */ -char *crl_dir = NULL; /* directory containing CRL files */ -char *crl_file = NULL; /* Certificate Revocation List (CRL) file (pem format) */ -char *max_tls_version = NULL; /* Maximum TLS protocol version (default=1.2) */ -bool need_peer_eap = 0; /* Require peer to authenticate us */ + +#if defined(PPP_WITH_EAPTLS) || defined(PPP_WITH_PEAP) +char *cacert_file = NULL; /* CA certificate file (pem format) */ +char *ca_path = NULL; /* Directory with CA certificates */ +char *crl_dir = NULL; /* Directory containing CRL files */ +char *crl_file = NULL; /* Certificate Revocation List (CRL) file (pem format) */ +char *max_tls_version = NULL; /* Maximum TLS protocol version (default=1.2) */ +char *tls_verify_method = NULL; /* Verify certificate method */ +bool tls_verify_key_usage = 0; /* Verify peer certificate key usage */ #endif -static char *uafname; /* name of most recent +ua file */ +#if defined(PPP_WITH_EAPTLS) +char *cert_file = NULL; /* Client certificate file (pem format) */ +char *privkey_file = NULL; /* Client private key file (pem format) */ +char *pkcs12_file = NULL; /* Client private key envelope file (pkcs12 format) */ +bool need_peer_eap = 0; /* Require peer to authenticate us */ +#endif -extern char *crypt __P((const char *, const char *)); +static char *uafname; /* name of most recent +ua file */ /* Prototypes for procedures local to this file. */ -static void network_phase __P((int)); -static void check_idle __P((void *)); -static void connect_time_expired __P((void *)); -static int null_login __P((int)); -static int get_pap_passwd __P((char *)); -static int have_pap_secret __P((int *)); -static int have_chap_secret __P((char *, char *, int, int *)); -static int have_srp_secret __P((char *client, char *server, int need_ip, - int *lacks_ipp)); - -#ifdef USE_EAPTLS +static void network_phase (int); +static void check_idle (void *); +static void connect_time_expired (void *); +static int null_login (int); +static int get_pap_passwd (char *); +static int have_pap_secret (int *); +static int have_chap_secret (char *, char *, int, int *); +static int have_srp_secret(char *client, char *server, int need_ip, + int *lacks_ipp); + +#ifdef PPP_WITH_EAPTLS static int have_eaptls_secret_server -__P((char *client, char *server, int need_ip, int *lacks_ipp)); -static int have_eaptls_secret_client __P((char *client, char *server)); -static int scan_authfile_eaptls __P((FILE * f, char *client, char *server, +(char *client, char *server, int need_ip, int *lacks_ipp); +static int have_eaptls_secret_client (char *client, char *server); +static int scan_authfile_eaptls(FILE * f, char *client, char *server, char *cli_cert, char *serv_cert, char *ca_cert, char *pk, struct wordlist ** addrs, struct wordlist ** opts, - char *filename, int flags)); + char *filename, int flags); #endif -static int ip_addr_check __P((u_int32_t, struct permitted_ip *)); -static int scan_authfile __P((FILE *, char *, char *, char *, - struct wordlist **, struct wordlist **, - char *, int)); -static void free_wordlist __P((struct wordlist *)); -static void auth_script __P((char *)); -static void auth_script_done __P((void *)); -static void set_allowed_addrs __P((int, struct wordlist *, struct wordlist *)); -static int some_ip_ok __P((struct wordlist *)); -static int setupapfile __P((char **)); -static int privgroup __P((char **)); -static int set_noauth_addr __P((char **)); -static int set_permitted_number __P((char **)); -static void check_access __P((FILE *, char *)); -static int wordlist_count __P((struct wordlist *)); - -#ifdef MAXOCTETS -static void check_maxoctets __P((void *)); -#endif +static int ip_addr_check (u_int32_t, struct permitted_ip *); +static int scan_authfile(FILE *, char *, char *, char *, + struct wordlist **, struct wordlist **, + char *, int); +static void free_wordlist (struct wordlist *); +static void auth_script (char *); +static void auth_script_done (void *); +static void set_allowed_addrs (int, struct wordlist *, struct wordlist *); +static int some_ip_ok (struct wordlist *); +static int setupapfile (char **); +static int privgroup (char **); +static int set_noauth_addr (char **); +static int set_permitted_number (char **); +static void check_access (FILE *, char *); +static int wordlist_count (struct wordlist *); +static void check_maxoctets (void *); /* * Authentication-related options. @@ -332,7 +342,7 @@ option_t auth_options[] = { "Require CHAP authentication from peer", OPT_ALIAS | OPT_PRIOSUB | OPT_A2OR | MDTYPE_MD5, &lcp_wantoptions[0].chap_mdtype }, -#ifdef CHAPMS +#ifdef PPP_WITH_CHAPMS { "require-mschap", o_bool, &auth_required, "Require MS-CHAP authentication from peer", OPT_PRIOSUB | OPT_A2OR | MDTYPE_MICROSOFT, @@ -363,7 +373,7 @@ option_t auth_options[] = { "Don't allow CHAP authentication with peer", OPT_ALIAS | OPT_A2CLRB | MDTYPE_MD5, &lcp_allowoptions[0].chap_mdtype }, -#ifdef CHAPMS +#ifdef PPP_WITH_CHAPMS { "refuse-mschap", o_bool, &refuse_mschap, "Don't agree to auth to peer with MS-CHAP", OPT_A2CLRB | MDTYPE_MICROSOFT, @@ -436,18 +446,26 @@ option_t auth_options[] = { "Set telephone number(s) which are allowed to connect", OPT_PRIV | OPT_A2LIST }, -#ifdef USE_EAPTLS - { "ca", o_string, &cacert_file, "EAP-TLS CA certificate in PEM format" }, - { "capath", o_string, &ca_path, "EAP-TLS CA certificate directory" }, - { "cert", o_string, &cert_file, "EAP-TLS client certificate in PEM format" }, - { "key", o_string, &privkey_file, "EAP-TLS client private key in PEM format" }, - { "crl-dir", o_string, &crl_dir, "Use CRLs in directory" }, - { "crl", o_string, &crl_file, "Use specific CRL file" }, +#if defined(PPP_WITH_EAPTLS) || defined(PPP_WITH_PEAP) + { "ca", o_string, &cacert_file, "CA certificate in PEM format" }, + { "capath", o_string, &ca_path, "TLS CA certificate directory" }, + { "crl-dir", o_string, &crl_dir, "Use CRLs in directory" }, + { "crl", o_string, &crl_file, "Use specific CRL file" }, { "max-tls-version", o_string, &max_tls_version, "Maximum TLS version (1.0/1.1/1.2 (default)/1.3)" }, + { "tls-verify-key-usage", o_bool, &tls_verify_key_usage, + "Verify certificate type and extended key usage" }, + { "tls-verify-method", o_string, &tls_verify_method, + "Verify peer by method (none|subject|name|suffix)" }, +#endif + +#if defined(PPP_WITH_EAPTLS) + { "cert", o_string, &cert_file, "client certificate in PEM format" }, + { "key", o_string, &privkey_file, "client private key in PEM format" }, + { "pkcs12", o_string, &pkcs12_file, "EAP-TLS client credentials in PKCS12 format" }, { "need-peer-eap", o_bool, &need_peer_eap, "Require the peer to authenticate us", 1 }, -#endif /* USE_EAPTLS */ +#endif /* PPP_WITH_EAPTLS */ { NULL } }; @@ -455,8 +473,7 @@ option_t auth_options[] = { * setupapfile - specifies UPAP info for authenticating with peer. */ static int -setupapfile(argv) - char **argv; +setupapfile(char **argv) { FILE *ufile; int l; @@ -523,8 +540,7 @@ setupapfile(argv) * privgroup - allow members of the group to have privileged access. */ static int -privgroup(argv) - char **argv; +privgroup(char **argv) { struct group *g; int i; @@ -549,8 +565,7 @@ privgroup(argv) * Equivalent to specifying an entry like `"" * "" addr' in pap-secrets. */ static int -set_noauth_addr(argv) - char **argv; +set_noauth_addr(char **argv) { char *addr = *argv; int l = strlen(addr) + 1; @@ -571,8 +586,7 @@ set_noauth_addr(argv) * set_permitted_number - set remote telephone number(s) that may connect. */ static int -set_permitted_number(argv) - char **argv; +set_permitted_number(char **argv) { char *number = *argv; int l = strlen(number) + 1; @@ -593,16 +607,14 @@ set_permitted_number(argv) * An Open on LCP has requested a change from Dead to Establish phase. */ void -link_required(unit) - int unit; +link_required(int unit) { } /* * Bring the link up to the point of being able to do ppp. */ -void start_link(unit) - int unit; +void start_link(int unit) { status = EXIT_CONNECT_FAILED; new_phase(PHASE_SERIALCONN); @@ -661,8 +673,7 @@ void start_link(unit) * physical layer down. */ void -link_terminated(unit) - int unit; +link_terminated(int unit) { if (phase == PHASE_DEAD || phase == PHASE_MASTER) return; @@ -731,8 +742,7 @@ link_terminated(unit) * LCP has gone down; it will either die or try to re-establish. */ void -link_down(unit) - int unit; +link_down(int unit) { if (auth_state != s_down) { notify(link_down_notifier, 0); @@ -774,14 +784,13 @@ void upper_layers_down(int unit) * Proceed to the Dead, Authenticate or Network phase as appropriate. */ void -link_established(unit) - int unit; +link_established(int unit) { int auth; lcp_options *wo = &lcp_wantoptions[unit]; lcp_options *go = &lcp_gotoptions[unit]; lcp_options *ho = &lcp_hisoptions[unit]; -#ifdef USE_EAPTLS +#ifdef PPP_WITH_EAPTLS lcp_options *ao = &lcp_allowoptions[unit]; #endif int i; @@ -818,7 +827,7 @@ link_established(unit) } } -#ifdef USE_EAPTLS +#ifdef PPP_WITH_EAPTLS if (need_peer_eap && !ao->neg_eap) { warn("eap required to authenticate us but no suitable secrets"); lcp_close(unit, "couldn't negotiate eap"); @@ -874,8 +883,7 @@ link_established(unit) * Proceed to the network phase. */ static void -network_phase(unit) - int unit; +network_phase(int unit) { lcp_options *go = &lcp_gotoptions[unit]; @@ -886,8 +894,8 @@ network_phase(unit) /* * If the peer had to authenticate, run the auth-up script now. */ + notify(auth_up_notifier, 0); if (go->neg_chap || go->neg_upap || go->neg_eap) { - notify(auth_up_notifier, 0); auth_state = s_up; if (auth_script_state == s_down && auth_script_pid == 0) { auth_script_state = s_up; @@ -895,7 +903,7 @@ network_phase(unit) } } -#ifdef CBCP_SUPPORT +#ifdef PPP_WITH_CBCP /* * If we negotiated callback, do it now. */ @@ -918,8 +926,7 @@ network_phase(unit) } void -start_networks(unit) - int unit; +start_networks(int unit) { int i; struct protent *protp; @@ -927,7 +934,7 @@ start_networks(unit) new_phase(PHASE_NETWORK); -#ifdef HAVE_MULTILINK +#ifdef PPP_WITH_MULTILINK if (multilink) { if (mp_join_bundle()) { if (multilink_join_hook) @@ -937,9 +944,9 @@ start_networks(unit) return; } } -#endif /* HAVE_MULTILINK */ +#endif /* PPP_WITH_MULTILINK */ -#ifdef PPP_FILTER +#ifdef PPP_WITH_FILTER if (!demand) set_filters(&pass_filter, &active_filter); #endif @@ -959,8 +966,7 @@ start_networks(unit) } void -continue_networks(unit) - int unit; +continue_networks(int unit) { int i; struct protent *protp; @@ -985,8 +991,7 @@ continue_networks(unit) * The peer has failed to authenticate himself using `protocol'. */ void -auth_peer_fail(unit, protocol) - int unit, protocol; +auth_peer_fail(int unit, int protocol) { /* * Authentication failure: take the link down @@ -999,10 +1004,8 @@ auth_peer_fail(unit, protocol) * The peer has been successfully authenticated using `protocol'. */ void -auth_peer_success(unit, protocol, prot_flavor, name, namelen) - int unit, protocol, prot_flavor; - char *name; - int namelen; +auth_peer_success(int unit, int protocol, int prot_flavor, + char *name, int namelen) { int bit; @@ -1013,7 +1016,7 @@ auth_peer_success(unit, protocol, prot_flavor, name, namelen) case CHAP_MD5: bit |= CHAP_MD5_PEER; break; -#ifdef CHAPMS +#ifdef PPP_WITH_CHAPMS case CHAP_MICROSOFT: bit |= CHAP_MS_PEER; break; @@ -1058,8 +1061,7 @@ auth_peer_success(unit, protocol, prot_flavor, name, namelen) * We have failed to authenticate ourselves to the peer using `protocol'. */ void -auth_withpeer_fail(unit, protocol) - int unit, protocol; +auth_withpeer_fail(int unit, int protocol) { if (passwd_from_file) BZERO(passwd, MAXSECRETLEN); @@ -1077,8 +1079,7 @@ auth_withpeer_fail(unit, protocol) * We have successfully authenticated ourselves with the peer using `protocol'. */ void -auth_withpeer_success(unit, protocol, prot_flavor) - int unit, protocol, prot_flavor; +auth_withpeer_success(int unit, int protocol, int prot_flavor) { int bit; const char *prot = ""; @@ -1091,7 +1092,7 @@ auth_withpeer_success(unit, protocol, prot_flavor) case CHAP_MD5: bit |= CHAP_MD5_WITHPEER; break; -#ifdef CHAPMS +#ifdef PPP_WITH_CHAPMS case CHAP_MICROSOFT: bit |= CHAP_MS_WITHPEER; break; @@ -1134,8 +1135,7 @@ auth_withpeer_success(unit, protocol, prot_flavor) * np_up - a network protocol has come up. */ void -np_up(unit, proto) - int unit, proto; +np_up(int unit, int proto) { int tlim; @@ -1161,10 +1161,8 @@ np_up(unit, proto) if (maxconnect > 0) TIMEOUT(connect_time_expired, 0, maxconnect); -#ifdef MAXOCTETS if (maxoctets > 0) TIMEOUT(check_maxoctets, NULL, maxoctets_timeout); -#endif /* * Detach now, if the updetach option was given. @@ -1186,15 +1184,12 @@ np_up(unit, proto) * np_down - a network protocol has gone down. */ void -np_down(unit, proto) - int unit, proto; +np_down(int unit, int proto) { if (--num_np_up == 0) { UNTIMEOUT(check_idle, NULL); UNTIMEOUT(connect_time_expired, NULL); -#ifdef MAXOCTETS UNTIMEOUT(check_maxoctets, NULL); -#endif new_phase(PHASE_NETWORK); } } @@ -1203,8 +1198,7 @@ np_down(unit, proto) * np_finished - a network protocol has finished using the link. */ void -np_finished(unit, proto) - int unit, proto; +np_finished(int unit, int proto) { if (--num_np_open <= 0) { /* no further use for the link: shut up shop. */ @@ -1212,10 +1206,8 @@ np_finished(unit, proto) } } -#ifdef MAXOCTETS static void -check_maxoctets(arg) - void *arg; +check_maxoctets(void *arg) { unsigned int used; @@ -1246,15 +1238,13 @@ check_maxoctets(arg) TIMEOUT(check_maxoctets, NULL, maxoctets_timeout); } } -#endif /* * check_idle - check whether the link has been idle for long * enough that we can shut it down. */ static void -check_idle(arg) - void *arg; +check_idle(void *arg) { struct ppp_idle idle; time_t itime; @@ -1283,8 +1273,7 @@ check_idle(arg) * connect_time_expired - log a message and close the connection. */ static void -connect_time_expired(arg) - void *arg; +connect_time_expired(void *arg) { info("Connect time expired"); status = EXIT_CONNECT_TIME; @@ -1295,7 +1284,7 @@ connect_time_expired(arg) * auth_check_options - called to check authentication options. */ void -auth_check_options() +auth_check_options(void) { lcp_options *wo = &lcp_wantoptions[0]; int can_auth; @@ -1354,7 +1343,7 @@ auth_check_options() our_name, 1, &lacks_ip); } -#ifdef USE_EAPTLS +#ifdef PPP_WITH_EAPTLS if (!can_auth && wo->neg_eap) { can_auth = have_eaptls_secret_server((explicit_remote ? remote_name : @@ -1400,8 +1389,7 @@ auth_check_options() * to use for authenticating ourselves and/or the peer. */ void -auth_reset(unit) - int unit; +auth_reset(int unit) { lcp_options *go = &lcp_gotoptions[unit]; lcp_options *ao = &lcp_allowoptions[unit]; @@ -1418,7 +1406,7 @@ auth_reset(unit) (hadchap == 1 || (hadchap == -1 && have_chap_secret(user, (explicit_remote? remote_name: NULL), 0, NULL))) || have_srp_secret(user, (explicit_remote? remote_name: NULL), 0, NULL) -#ifdef USE_EAPTLS +#ifdef PPP_WITH_EAPTLS || have_eaptls_secret_client(user, (explicit_remote? remote_name: NULL)) #endif ); @@ -1437,7 +1425,7 @@ auth_reset(unit) 1, NULL))) && !have_srp_secret((explicit_remote? remote_name: NULL), our_name, 1, NULL) -#ifdef USE_EAPTLS +#ifdef PPP_WITH_EAPTLS && !have_eaptls_secret_server((explicit_remote? remote_name: NULL), our_name, 1, NULL) #endif @@ -1457,13 +1445,9 @@ auth_reset(unit) * In either case, msg points to an appropriate message. */ int -check_passwd(unit, auser, userlen, apasswd, passwdlen, msg) - int unit; - char *auser; - int userlen; - char *apasswd; - int passwdlen; - char **msg; +check_passwd(int unit, + char *auser, int userlen, + char *apasswd, int passwdlen, char **msg) { int ret; char *filename; @@ -1537,8 +1521,10 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg) if (secret[0] != 0 && !login_secret) { /* password given in pap-secrets - must match */ if (cryptpap || strcmp(passwd, secret) != 0) { +#ifdef HAVE_CRYPT_H char *cbuf = crypt(passwd, secret); if (!cbuf || strcmp(cbuf, secret) != 0) +#endif ret = UPAP_AUTHNAK; } } @@ -1585,8 +1571,7 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg) * and return 1. */ static int -null_login(unit) - int unit; +null_login(int unit) { char *filename; FILE *f; @@ -1636,8 +1621,7 @@ null_login(unit) * Assumes passwd points to MAXSECRETLEN bytes of space (if non-null). */ static int -get_pap_passwd(passwd) - char *passwd; +get_pap_passwd(char *passwd) { char *filename; FILE *f; @@ -1676,8 +1660,7 @@ get_pap_passwd(passwd) * secrets that we could possibly use for authenticating the peer. */ static int -have_pap_secret(lacks_ipp) - int *lacks_ipp; +have_pap_secret(int *lacks_ipp) { FILE *f; int ret; @@ -1718,11 +1701,8 @@ have_pap_secret(lacks_ipp) * know the identity yet. */ static int -have_chap_secret(client, server, need_ip, lacks_ipp) - char *client; - char *server; - int need_ip; - int *lacks_ipp; +have_chap_secret(char *client, char *server, + int need_ip, int *lacks_ipp) { FILE *f; int ret; @@ -1767,11 +1747,7 @@ have_chap_secret(client, server, need_ip, lacks_ipp) * know the identity yet. */ static int -have_srp_secret(client, server, need_ip, lacks_ipp) - char *client; - char *server; - int need_ip; - int *lacks_ipp; +have_srp_secret(char *client, char *server, int need_ip, int *lacks_ipp) { FILE *f; int ret; @@ -1808,13 +1784,8 @@ have_srp_secret(client, server, need_ip, lacks_ipp) * (We could be either client or server). */ int -get_secret(unit, client, server, secret, secret_len, am_server) - int unit; - char *client; - char *server; - char *secret; - int *secret_len; - int am_server; +get_secret(int unit, char *client, char *server, + char *secret, int *secret_len, int am_server) { FILE *f; int ret, len; @@ -1874,12 +1845,8 @@ get_secret(unit, client, server, secret, secret_len, am_server) * (We could be either client or server). */ int -get_srp_secret(unit, client, server, secret, am_server) - int unit; - char *client; - char *server; - char *secret; - int am_server; +get_srp_secret(int unit, char *client, char *server, + char *secret, int am_server) { FILE *fp; int ret; @@ -1923,10 +1890,8 @@ get_srp_secret(unit, client, server, secret, am_server) * and leaves the following words in extra_options. */ static void -set_allowed_addrs(unit, addrs, opts) - int unit; - struct wordlist *addrs; - struct wordlist *opts; +set_allowed_addrs(int unit, struct wordlist *addrs, + struct wordlist *opts) { int n; struct wordlist *ap, **plink; @@ -2079,9 +2044,7 @@ set_allowed_addrs(unit, addrs, opts) * a given IP address. Returns 1 if authorized, 0 otherwise. */ int -auth_ip_addr(unit, addr) - int unit; - u_int32_t addr; +auth_ip_addr(int unit, u_int32_t addr) { int ok; @@ -2106,9 +2069,7 @@ auth_ip_addr(unit, addr) } static int -ip_addr_check(addr, addrs) - u_int32_t addr; - struct permitted_ip *addrs; +ip_addr_check(u_int32_t addr, struct permitted_ip *addrs) { for (; ; ++addrs) if ((addr & addrs->mask) == addrs->base) @@ -2121,8 +2082,7 @@ ip_addr_check(addr, addrs) * addr is in network byte order. */ int -bad_ip_adrs(addr) - u_int32_t addr; +bad_ip_adrs(u_int32_t addr) { addr = ntohl(addr); return (addr >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET @@ -2134,8 +2094,7 @@ bad_ip_adrs(addr) * IP address(es). */ static int -some_ip_ok(addrs) - struct wordlist *addrs; +some_ip_ok(struct wordlist *addrs) { for (; addrs != 0; addrs = addrs->next) { if (addrs->word[0] == '-') @@ -2151,7 +2110,7 @@ some_ip_ok(addrs) * Returns 1 if authorized, 0 otherwise. */ int -auth_number() +auth_number(void) { struct wordlist *wp = permitted_numbers; int l; @@ -2178,9 +2137,7 @@ auth_number() * check_access - complain if a secret file has too-liberal permissions. */ static void -check_access(f, filename) - FILE *f; - char *filename; +check_access(FILE *f, char *filename) { struct stat sbuf; @@ -2208,15 +2165,10 @@ check_access(f, filename) * match. */ static int -scan_authfile(f, client, server, secret, addrs, opts, filename, flags) - FILE *f; - char *client; - char *server; - char *secret; - struct wordlist **addrs; - struct wordlist **opts; - char *filename; - int flags; +scan_authfile(FILE *f, char *client, char *server, + char *secret, struct wordlist **addrs, + struct wordlist **opts, char *filename, + int flags) { int newline, xxx; int got_flag, best_flag; @@ -2371,8 +2323,7 @@ scan_authfile(f, client, server, secret, addrs, opts, filename, flags) * wordlist_count - return the number of items in a wordlist */ static int -wordlist_count(wp) - struct wordlist *wp; +wordlist_count(struct wordlist *wp) { int n; @@ -2385,8 +2336,7 @@ wordlist_count(wp) * free_wordlist - release memory allocated for a wordlist. */ static void -free_wordlist(wp) - struct wordlist *wp; +free_wordlist(struct wordlist *wp) { struct wordlist *next; @@ -2402,8 +2352,7 @@ free_wordlist(wp) * has finished. */ static void -auth_script_done(arg) - void *arg; +auth_script_done(void *arg) { auth_script_pid = 0; switch (auth_script_state) { @@ -2427,8 +2376,7 @@ auth_script_done(arg) * interface-name peer-name real-user tty speed */ static void -auth_script(script) - char *script; +auth_script(char *script) { char strspeed[32]; struct passwd *pw; @@ -2450,19 +2398,17 @@ auth_script(script) argv[3] = user_name; argv[4] = devnam; argv[5] = strspeed; - argv[6] = NULL; + argv[6] = ipparam; + argv[7] = NULL; auth_script_pid = run_program(script, argv, 0, auth_script_done, NULL, 0); } -#ifdef USE_EAPTLS +#ifdef PPP_WITH_EAPTLS static int -have_eaptls_secret_server(client, server, need_ip, lacks_ipp) - char *client; - char *server; - int need_ip; - int *lacks_ipp; +have_eaptls_secret_server(char *client, char *server, + int need_ip, int *lacks_ipp) { FILE *f; int ret; @@ -2509,9 +2455,7 @@ have_eaptls_secret_server(client, server, need_ip, lacks_ipp) static int -have_eaptls_secret_client(client, server) - char *client; - char *server; +have_eaptls_secret_client(char *client, char *server) { FILE *f; int ret; @@ -2529,6 +2473,8 @@ have_eaptls_secret_client(client, server) if ((cacert_file || ca_path) && cert_file && privkey_file) return 1; + if (pkcs12_file) + return 1; filename = _PATH_EAPTLSCLIFILE; f = fopen(filename, "r"); @@ -2555,19 +2501,11 @@ have_eaptls_secret_client(client, server) static int -scan_authfile_eaptls(f, client, server, cli_cert, serv_cert, ca_cert, pk, - addrs, opts, filename, flags) - FILE *f; - char *client; - char *server; - char *cli_cert; - char *serv_cert; - char *ca_cert; - char *pk; - struct wordlist **addrs; - struct wordlist **opts; - char *filename; - int flags; +scan_authfile_eaptls(FILE *f, char *client, char *server, + char *cli_cert, char *serv_cert, char *ca_cert, + char *pk, struct wordlist **addrs, + struct wordlist **opts, + char *filename, int flags) { int newline; int got_flag, best_flag; @@ -2718,17 +2656,9 @@ scan_authfile_eaptls(f, client, server, cli_cert, serv_cert, ca_cert, pk, int -get_eaptls_secret(unit, client, server, clicertfile, servcertfile, - cacertfile, capath, pkfile, am_server) - int unit; - char *client; - char *server; - char *clicertfile; - char *servcertfile; - char *cacertfile; - char *capath; - char *pkfile; - int am_server; +get_eaptls_secret(int unit, char *client, char *server, + char *clicertfile, char *servcertfile, char *cacertfile, + char *capath, char *pkfile, char *pkcs12, int am_server) { FILE *fp; int ret; @@ -2742,6 +2672,7 @@ get_eaptls_secret(unit, client, server, clicertfile, servcertfile, bzero(cacertfile, MAXWORDLEN); bzero(capath, MAXWORDLEN); bzero(pkfile, MAXWORDLEN); + bzero(pkcs12, MAXWORDLEN); /* the ca+cert+privkey can also be specified as options */ if (!am_server && (cacert_file || ca_path) && cert_file && privkey_file ) @@ -2753,6 +2684,14 @@ get_eaptls_secret(unit, client, server, clicertfile, servcertfile, strlcpy( capath, ca_path, MAXWORDLEN ); strlcpy( pkfile, privkey_file, MAXWORDLEN ); } + else if (!am_server && pkcs12_file) + { + strlcpy( pkcs12, pkcs12_file, MAXWORDLEN ); + if (cacert_file) + strlcpy( cacertfile, cacert_file, MAXWORDLEN ); + if (ca_path) + strlcpy( capath, ca_path, MAXWORDLEN ); + } else { filename = (am_server ? _PATH_EAPTLSSERVFILE : _PATH_EAPTLSCLIFILE);