On 2018/03/15 08:55, Raf Czlonka wrote:
> Hi all,
>
> As per jmc's commit message[0], would anyone be so kind as to comment
> on this, please?
>
> Thanks again to Jason for fixing the non-code bits.
>
> [0] https://marc.info/?m=151993729713231
>
> Cheers,
>
> Raf
>
...
> > > +++ include/arpa/nameser.h 26 Feb 2018 11:03:07 -0000
> > > @@ -223,7 +223,7 @@
> > > #define KEYFLAG_USERACCOUNT 0x0400 /* key is assoc. with a user
> > > acct */
> > > #define KEYFLAG_ENTITY 0x0200 /* key is assoc. with entity eg
> > > host */
> > > #define KEYFLAG_ZONEKEY 0x0100 /* key is zone key for the zone
> > > named */
> > > -#define KEYFLAG_IPSEC 0x0080 /* key is for IPSEC use (host
> > > or user)*/
> > > +#define KEYFLAG_IPSEC 0x0080 /* key is for IPsec use (host
> > > or user)*/
ok
> > > retrieving revision 1.15
> > > diff -u -p -r1.15 ec_curve.c
> > > --- lib/libcrypto/ec/ec_curve.c 29 Jan 2017 17:49:23 -0000 1.15
> > > +++ lib/libcrypto/ec/ec_curve.c 26 Feb 2018 11:03:09 -0000
> > > @@ -2135,7 +2135,7 @@ static const struct {
> > > }
> > > };
> > >
> > > -/* IPSec curves */
> > > +/* IPsec curves */
ok
> > > /* NOTE: The of curves over a extension field of non prime degree
> > > * is not recommended (Weil-descent).
> > > * As the group order is not a prime this curve is not suitable
> > > @@ -3116,10 +3116,10 @@ static const ec_list_element curve_list[
> > > #endif
> > > {NID_wap_wsg_idm_ecid_wtls12, &_EC_WTLS_12.h, 0, "WTLS curve over a 224
> > > bit prime field"},
> > > #ifndef OPENSSL_NO_EC2M
> > > - /* IPSec curves */
> > > - {NID_ipsec3, &_EC_IPSEC_155_ID3.h, 0, "\n\tIPSec/IKE/Oakley curve #3
> > > over a 155 bit binary field.\n"
> > > + /* IPsec curves */
> > > + {NID_ipsec3, &_EC_IPSEC_155_ID3.h, 0, "\n\tIPsec/IKE/Oakley curve #3
> > > over a 155 bit binary field.\n"
> > > "\tNot suitable for ECDSA.\n\tQuestionable extension field!"},
> > > - {NID_ipsec4, &_EC_IPSEC_185_ID4.h, 0, "\n\tIPSec/IKE/Oakley curve #4
> > > over a 185 bit binary field.\n"
> > > + {NID_ipsec4, &_EC_IPSEC_185_ID4.h, 0, "\n\tIPsec/IKE/Oakley curve #4
> > > over a 185 bit binary field.\n"
I don't know if anything will parse these and expect to be as-is.
Without more information I'd skip this.
> > > "\tNot suitable for ECDSA.\n\tQuestionable extension field!"},
> > > #endif
> > > /* RFC 5639 curves */
> > > Index: lib/libcrypto/objects/objects.txt
> > > ===================================================================
> > > RCS file: /cvs/src/lib/libcrypto/objects/objects.txt,v
> > > retrieving revision 1.19
> > > diff -u -p -r1.19 objects.txt
> > > --- lib/libcrypto/objects/objects.txt 25 May 2017 17:00:24 -0000
> > > 1.19
> > > +++ lib/libcrypto/objects/objects.txt 26 Feb 2018 11:03:09 -0000
> > > @@ -486,9 +486,9 @@ id-kp 2 : clientAuth
> > > : TLS Web Client
> > > id-kp 3 : codeSigning : Code Signing
> > > !Cname email-protect
> > > id-kp 4 : emailProtection : E-mail Protection
> > > -id-kp 5 : ipsecEndSystem : IPSec End System
> > > -id-kp 6 : ipsecTunnel : IPSec Tunnel
> > > -id-kp 7 : ipsecUser : IPSec User
> > > +id-kp 5 : ipsecEndSystem : IPsec End System
> > > +id-kp 6 : ipsecTunnel : IPsec Tunnel
> > > +id-kp 7 : ipsecUser : IPsec User
Same as above, no idea what uses it.
> > > !Cname time-stamp
> > > id-kp 8 : timeStamping : Time Stamping
> > > # From OCSP spec RFC2560
> > > Index: sbin/iked/iked.h
> > > ===================================================================
> > > RCS file: /cvs/src/sbin/iked/iked.h,v
> > > retrieving revision 1.117
> > > diff -u -p -r1.117 iked.h
> > > --- sbin/iked/iked.h 30 Nov 2017 12:18:44 -0000 1.117
> > > +++ sbin/iked/iked.h 26 Feb 2018 11:03:14 -0000
> > > @@ -165,7 +165,7 @@ RB_HEAD(iked_flows, iked_flow);
> > > TAILQ_HEAD(iked_saflows, iked_flow);
> > >
> > > struct iked_childsa {
> > > - uint8_t csa_saproto; /* IPSec protocol */
> > > + uint8_t csa_saproto; /* IPsec protocol */
> > > unsigned int csa_dir; /* in/out */
> > >
> > > uint64_t csa_peerspi; /* peer relation */
> > > @@ -432,8 +432,8 @@ struct iked_sa {
> > > struct ibuf *sa_eapmsk; /* EAK session key */
> > >
> > > struct iked_proposals sa_proposals; /* SA proposals */
> > > - struct iked_childsas sa_childsas; /* IPSec Child SAs */
> > > - struct iked_saflows sa_flows; /* IPSec flows */
> > > + struct iked_childsas sa_childsas; /* IPsec Child SAs */
> > > + struct iked_saflows sa_flows; /* IPsec flows */
> > >
> > > struct iked_sa *sa_nexti; /* initiated IKE SA */
> > > struct iked_sa *sa_nextr; /* simultaneous rekey */
ok
> > > Index: sys/dev/pci/ixgbe_type.h
Not sure, it might be better to leave as-is to aid diffability.
Deferring to anyone who might sync driver changes across.
> > > Index: sys/netinet6/ip6_output.c
> > > ===================================================================
> > > RCS file: /cvs/src/sys/netinet6/ip6_output.c,v
> > > retrieving revision 1.234
> > > diff -u -p -r1.234 ip6_output.c
> > > --- sys/netinet6/ip6_output.c 19 Feb 2018 08:59:53 -0000 1.234
> > > +++ sys/netinet6/ip6_output.c 26 Feb 2018 11:03:17 -0000
> > > @@ -1040,7 +1040,7 @@ ip6_ctloutput(int op, struct socket *so,
> > > void *optdata;
> > > struct inpcb *inp = sotoinpcb(so);
> > > int error, optval;
> > > - struct proc *p = curproc; /* For IPSec and rdomain */
> > > + struct proc *p = curproc; /* For IPsec and rdomain */
> > > u_int rtid = 0;
ok
> > > Index: usr.sbin/dhcrelay/dhcrelay.c
> > > ===================================================================
> > > RCS file: /cvs/src/usr.sbin/dhcrelay/dhcrelay.c,v
> > > retrieving revision 1.63
> > > diff -u -p -r1.63 dhcrelay.c
> > > --- usr.sbin/dhcrelay/dhcrelay.c 5 Jul 2017 11:11:56 -0000 1.63
> > > +++ usr.sbin/dhcrelay/dhcrelay.c 26 Feb 2018 11:03:19 -0000
> > > @@ -174,7 +174,7 @@ main(int argc, char *argv[])
> > > fatalx("don't mix interfaces with hosts");
> > >
> > > if (sp->intf->hw_address.htype == HTYPE_IPSEC_TUNNEL)
> > > - fatalx("can't use IPSec with layer 2");
> > > + fatalx("can't use IPsec with layer 2");
> > >
> > > sp->next = servers;
> > > servers = sp;
ok
> > > Index: usr.sbin/npppd/l2tp/l2tp_ctrl.c
> > > ===================================================================
> > > RCS file: /cvs/src/usr.sbin/npppd/l2tp/l2tp_ctrl.c,v
> > > retrieving revision 1.21
> > > diff -u -p -r1.21 l2tp_ctrl.c
> > > --- usr.sbin/npppd/l2tp/l2tp_ctrl.c 5 Dec 2015 18:43:36 -0000
> > > 1.21
> > > +++ usr.sbin/npppd/l2tp/l2tp_ctrl.c 26 Feb 2018 11:03:20 -0000
> > > @@ -442,7 +442,7 @@ l2tp_ctrl_purge_ipsec_sa(l2tp_ctrl *_thi
> > > #endif
> > > if (ipsec_util_purge_transport_sa((struct sockaddr *)&peer,
> > > (struct sockaddr *)&sock, proto, IPSEC_UTIL_DIRECTION_BOTH) != 0)
> > > - l2tp_ctrl_log(_this, LOG_NOTICE, "failed to purge IPSec SA");
> > > + l2tp_ctrl_log(_this, LOG_NOTICE, "failed to purge IPsec SA");
> > > }
> > > #endif
ok
