diff options
Diffstat (limited to 'src/pluto')
| -rw-r--r-- | src/pluto/constants.h | 2 | ||||
| -rw-r--r-- | src/pluto/demux.c | 4 | ||||
| -rw-r--r-- | src/pluto/kernel_alg.c | 2 | ||||
| -rw-r--r-- | src/pluto/lex.h | 2 | ||||
| -rw-r--r-- | src/pluto/nat_traversal.c | 2 | ||||
| -rw-r--r-- | src/pluto/pluto.8 | 4 | ||||
| -rw-r--r-- | src/pluto/rcv_whack.c | 2 | ||||
| -rw-r--r-- | src/pluto/spdb.c | 2 | ||||
| -rw-r--r-- | src/pluto/spdb.h | 2 | ||||
| -rw-r--r-- | src/pluto/state.c | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/src/pluto/constants.h b/src/pluto/constants.h index 075579d6d..c931f1782 100644 --- a/src/pluto/constants.h +++ b/src/pluto/constants.h @@ -658,7 +658,7 @@ extern const char *prettypolicy(lset_t policy); #define POLICY_COMPRESS LELEM(4) /* must be third */ #define POLICY_TUNNEL LELEM(5) #define POLICY_PFS LELEM(6) -#define POLICY_DISABLEARRIVALCHECK LELEM(7) /* supress tunnel egress address checking */ +#define POLICY_DISABLEARRIVALCHECK LELEM(7) /* suppress tunnel egress address checking */ #define POLICY_IPSEC_SHIFT 2 /* log2(POLICY_ENCRYPT) */ #define POLICY_IPSEC_MASK LRANGES(POLICY_ENCRYPT, POLICY_DISABLEARRIVALCHECK) diff --git a/src/pluto/demux.c b/src/pluto/demux.c index 294601295..612e0813c 100644 --- a/src/pluto/demux.c +++ b/src/pluto/demux.c @@ -544,7 +544,7 @@ init_demux(void) * - ip(7) describes IP_RECVERR * - recvmsg(2) describes MSG_ERRQUEUE * - readv(2) describes iovec - * - cmsg(3) describes how to process auxilliary messages + * - cmsg(3) describes how to process auxiliary messages * * ??? we should link this message with one we've sent * so that the diagnostic can refer to that negotiation. @@ -1580,7 +1580,7 @@ process_packet(struct msg_digest **mdp) /* * okay, now we have to figure out if we are receiving a bogus - * new message in an oustanding XAUTH server conversation + * new message in an outstanding XAUTH server conversation * (i.e. a reply to our challenge) * (this occurs with some broken other implementations). * diff --git a/src/pluto/kernel_alg.c b/src/pluto/kernel_alg.c index eab2a8f06..b4b18fd80 100644 --- a/src/pluto/kernel_alg.c +++ b/src/pluto/kernel_alg.c @@ -205,7 +205,7 @@ bool kernel_alg_esp_ok_final(u_int ealg, u_int key_len, u_int aalg, /* * key_len passed comes from esp_attrs read from peer - * For many older algoritms (eg 3DES) this key_len is fixed + * For many older algorithms (eg 3DES) this key_len is fixed * and get passed as 0. * ... then get default key_len */ diff --git a/src/pluto/lex.h b/src/pluto/lex.h index f16769144..aa0be7829 100644 --- a/src/pluto/lex.h +++ b/src/pluto/lex.h @@ -22,7 +22,7 @@ struct file_lex_position int lino; /* line number in file */ char buffer[MAX_TOK_LEN + 1]; /* note: one extra char for our use (jamming '"') */ char *cur; /* cursor */ - char under; /* except in shift(): character orignally at *cur */ + char under; /* except in shift(): character originally at *cur */ struct file_lex_position *previous; }; diff --git a/src/pluto/nat_traversal.c b/src/pluto/nat_traversal.c index 5e9353b72..28be76825 100644 --- a/src/pluto/nat_traversal.c +++ b/src/pluto/nat_traversal.c @@ -232,7 +232,7 @@ void nat_traversal_natd_lookup(struct msg_digest *md) if (i < 2) { loglog(RC_LOG_SERIOUS, - "NAT-Traversal: Only %d NAT-D - Aborting NAT-Traversal negociation", i); + "NAT-Traversal: Only %d NAT-D - Aborting NAT-Traversal negotiation", i); st->nat_traversal = 0; return; } diff --git a/src/pluto/pluto.8 b/src/pluto/pluto.8 index 9ac537bd9..ed6f78050 100644 --- a/src/pluto/pluto.8 +++ b/src/pluto/pluto.8 @@ -1437,7 +1437,7 @@ Phase 1. \fBPluto\fP responds to \fBSIGHUP\fP by issuing a suggestion that ``\fBwhack\fP \-\-listen'' might have been intended. .LP -\fBPluto\fP exits when it recieves \fBSIGTERM\fP. +\fBPluto\fP exits when it receives \fBSIGTERM\fP. .SH EXIT STATUS .LP \fBpluto\fP normally forks a daemon process, so the exit status is @@ -1558,7 +1558,7 @@ There is no good way for a connection to be automatically terminated. This is a problem for Road Warrior and Opportunistic connections. The \fB\-\-dontrekey\fP option does prevent the SAs from being rekeyed on expiry. -Additonally, if a Road Warrior connection has a client subnet with a fixed IP +Additionally, if a Road Warrior connection has a client subnet with a fixed IP address, a negotiation with that subnet will cause any other connection instantiations with that same subnet to be unoriented (deleted, in effect). diff --git a/src/pluto/rcv_whack.c b/src/pluto/rcv_whack.c index c140095f0..8db8a965e 100644 --- a/src/pluto/rcv_whack.c +++ b/src/pluto/rcv_whack.c @@ -282,7 +282,7 @@ void whack_handle(int whackctlfd) { if (msg.magic == WHACK_BASIC_MAGIC) { - /* Only shutdown command. Simpler inter-version compatability. */ + /* Only shutdown command. Simpler inter-version compatibility. */ if (msg.whack_shutdown) { plog("shutting down"); diff --git a/src/pluto/spdb.c b/src/pluto/spdb.c index 48585432b..06fe7d7c8 100644 --- a/src/pluto/spdb.c +++ b/src/pluto/spdb.c @@ -1300,7 +1300,7 @@ notification_t parse_isakmp_sa_body(u_int32_t ipsecdoisit, * proposal is emitted into it. * * If "selection" is true, the SA is supposed to represent the - * single tranform that the peer has accepted. + * single transform that the peer has accepted. * ??? We only check that it is acceptable, not that it is one that we offered! * * Only IPsec DOI is accepted (what is the ISAKMP DOI?). diff --git a/src/pluto/spdb.h b/src/pluto/spdb.h index 221cc00bb..8a0bffbbd 100644 --- a/src/pluto/spdb.h +++ b/src/pluto/spdb.h @@ -100,7 +100,7 @@ extern notification_t parse_ipsec_sa_body( pb_stream *sa_pbs, /* body of input SA Payload */ const struct isakmp_sa *sa, /* header of input SA Payload */ pb_stream *r_sa_pbs, /* if non-NULL, where to emit winning SA */ - bool selection, /* if this SA is a selection, only one tranform can appear */ + bool selection, /* if this SA is a selection, only one transform can appear */ struct state *st); /* current state object */ extern void backup_pbs(pb_stream *pbs); diff --git a/src/pluto/state.c b/src/pluto/state.c index e4234bc87..f5185888e 100644 --- a/src/pluto/state.c +++ b/src/pluto/state.c @@ -216,7 +216,7 @@ struct state *state_with_serialno(so_serial_t sn) } /* Insert a state object in the hash table. The object is inserted - * at the begining of list. + * at the beginning of list. * Needs cookies, connection, and msgid. */ void insert_state(struct state *st) |