summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2016-03-20 16:50:29 +0000
committerkrw <krw@openbsd.org>2016-03-20 16:50:29 +0000
commitc05e1f5dbd7b7073c69d00f6853c46a7e2a1c189 (patch)
treeda08b759a5b800c136d76d341893b135cf834aba
parentUpdate the axen driver to initialize the hardware on reset. Change was suggested by Takahiro Hayashi. Also lock the mii before performing the write, based on changes in NetBSD. While in there, remove the decaying eeprom code that has been commented out. This allows my adapter to attach reliably, ... (diff)
downloadwireguard-openbsd-c05e1f5dbd7b7073c69d00f6853c46a7e2a1c189.tar.xz
wireguard-openbsd-c05e1f5dbd7b7073c69d00f6853c46a7e2a1c189.zip
" the the " -> " the ", or in a couple of cases replace the superfluous
"the" with the obviously intended word. Started with a "the the" spotted by Mihal Mazurek.
-rw-r--r--lib/libcrypto/des/asm/des_enc.m42
-rw-r--r--lib/libcrypto/ec/ec_asn1.c4
-rw-r--r--lib/libexpat/doc/reference.html2
-rw-r--r--lib/libssl/s3_cbc.c4
-rw-r--r--lib/libssl/src/crypto/des/asm/des_enc.m42
-rw-r--r--lib/libssl/src/crypto/ec/ec_asn1.c4
-rw-r--r--lib/libssl/src/doc/apps/ca.pod2
-rw-r--r--lib/libssl/src/doc/apps/dgst.pod2
-rw-r--r--lib/libssl/src/doc/apps/x509.pod2
-rw-r--r--lib/libssl/src/ssl/s3_cbc.c4
-rw-r--r--sys/lib/libkern/arch/amd64/strlen.S4
-rw-r--r--usr.bin/mandoc/term.c4
12 files changed, 18 insertions, 18 deletions
diff --git a/lib/libcrypto/des/asm/des_enc.m4 b/lib/libcrypto/des/asm/des_enc.m4
index 68c162e5d82..b1177358287 100644
--- a/lib/libcrypto/des/asm/des_enc.m4
+++ b/lib/libcrypto/des/asm/des_enc.m4
@@ -130,7 +130,7 @@ changequote({,})
!
! Loads key first round from address in parameter 5 to out0, out1.
!
-! After the the original LibDES initial permutation, the resulting left
+! After the original LibDES initial permutation, the resulting left
! is in the variable initially used for right and vice versa. The macro
! implements the possibility to keep the halfs in the original registers.
!
diff --git a/lib/libcrypto/ec/ec_asn1.c b/lib/libcrypto/ec/ec_asn1.c
index adaff98b2f8..3234e7a6f2b 100644
--- a/lib/libcrypto/ec/ec_asn1.c
+++ b/lib/libcrypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1.c,v 1.21 2015/10/16 15:15:39 jsing Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.22 2016/03/20 16:50:29 krw Exp $ */
/*
* Written by Nils Larsch for the OpenSSL project.
*/
@@ -1019,7 +1019,7 @@ ec_asn1_group2pkparameters(const EC_GROUP * group, ECPKPARAMETERS * params)
if (EC_GROUP_get_asn1_flag(group)) {
/*
- * use the asn1 OID to describe the the elliptic curve
+ * use the asn1 OID to describe the elliptic curve
* parameters
*/
tmp = EC_GROUP_get_curve_name(group);
diff --git a/lib/libexpat/doc/reference.html b/lib/libexpat/doc/reference.html
index 8811a3397c7..8b84d514f66 100644
--- a/lib/libexpat/doc/reference.html
+++ b/lib/libexpat/doc/reference.html
@@ -373,7 +373,7 @@ the right MSVC magic annotations correct. This is ignored on other
platforms.</dd>
<dt>XML_ATTR_INFO</dt>
-<dd>If defined, makes the the additional function <code><a href=
+<dd>If defined, makes the additional function <code><a href=
"#XML_GetAttributeInfo" >XML_GetAttributeInfo</a></code> available
for reporting attribute byte offsets.</dd>
</dl>
diff --git a/lib/libssl/s3_cbc.c b/lib/libssl/s3_cbc.c
index 824ccf983b8..414d493150d 100644
--- a/lib/libssl/s3_cbc.c
+++ b/lib/libssl/s3_cbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_cbc.c,v 1.11 2015/09/11 17:17:44 jsing Exp $ */
+/* $OpenBSD: s3_cbc.c,v 1.12 2016/03/20 16:50:29 krw Exp $ */
/* ====================================================================
* Copyright (c) 2012 The OpenSSL Project. All rights reserved.
*
@@ -601,7 +601,7 @@ ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, unsigned char* md_out,
* application data, and we are at the offset for the
* 0x80 value, then overwrite b with 0x80. */
b = (b&~is_past_c) | (0x80&is_past_c);
- /* If this the the block containing the end of the
+ /* If this is the block containing the end of the
* application data and we're past the 0x80 value then
* just write zero. */
b = b&~is_past_cp1;
diff --git a/lib/libssl/src/crypto/des/asm/des_enc.m4 b/lib/libssl/src/crypto/des/asm/des_enc.m4
index 68c162e5d82..b1177358287 100644
--- a/lib/libssl/src/crypto/des/asm/des_enc.m4
+++ b/lib/libssl/src/crypto/des/asm/des_enc.m4
@@ -130,7 +130,7 @@ changequote({,})
!
! Loads key first round from address in parameter 5 to out0, out1.
!
-! After the the original LibDES initial permutation, the resulting left
+! After the original LibDES initial permutation, the resulting left
! is in the variable initially used for right and vice versa. The macro
! implements the possibility to keep the halfs in the original registers.
!
diff --git a/lib/libssl/src/crypto/ec/ec_asn1.c b/lib/libssl/src/crypto/ec/ec_asn1.c
index adaff98b2f8..3234e7a6f2b 100644
--- a/lib/libssl/src/crypto/ec/ec_asn1.c
+++ b/lib/libssl/src/crypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1.c,v 1.21 2015/10/16 15:15:39 jsing Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.22 2016/03/20 16:50:29 krw Exp $ */
/*
* Written by Nils Larsch for the OpenSSL project.
*/
@@ -1019,7 +1019,7 @@ ec_asn1_group2pkparameters(const EC_GROUP * group, ECPKPARAMETERS * params)
if (EC_GROUP_get_asn1_flag(group)) {
/*
- * use the asn1 OID to describe the the elliptic curve
+ * use the asn1 OID to describe the elliptic curve
* parameters
*/
tmp = EC_GROUP_get_curve_name(group);
diff --git a/lib/libssl/src/doc/apps/ca.pod b/lib/libssl/src/doc/apps/ca.pod
index ecbe7954d65..42aa966bdca 100644
--- a/lib/libssl/src/doc/apps/ca.pod
+++ b/lib/libssl/src/doc/apps/ca.pod
@@ -88,7 +88,7 @@ section for information on the required format.
=item B<-infiles>
if present this should be the last option, all subsequent arguments
-are assumed to the the names of files containing certificate requests.
+are assumed to be the names of files containing certificate requests.
=item B<-out filename>
diff --git a/lib/libssl/src/doc/apps/dgst.pod b/lib/libssl/src/doc/apps/dgst.pod
index d8b2abc6fbd..33fac4d2070 100644
--- a/lib/libssl/src/doc/apps/dgst.pod
+++ b/lib/libssl/src/doc/apps/dgst.pod
@@ -86,7 +86,7 @@ see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)|openssl(1)>.
=item B<-verify filename>
-verify the signature using the the public key in "filename".
+verify the signature using the public key in "filename".
The output is either "Verification OK" or "Verification Failure".
=item B<-prverify filename>
diff --git a/lib/libssl/src/doc/apps/x509.pod b/lib/libssl/src/doc/apps/x509.pod
index 25471736a0e..1e62ac956ab 100644
--- a/lib/libssl/src/doc/apps/x509.pod
+++ b/lib/libssl/src/doc/apps/x509.pod
@@ -138,7 +138,7 @@ this option prevents output of the encoded version of the request.
=item B<-pubkey>
-outputs the the certificate's SubjectPublicKeyInfo block in PEM format.
+outputs the certificate's SubjectPublicKeyInfo block in PEM format.
=item B<-modulus>
diff --git a/lib/libssl/src/ssl/s3_cbc.c b/lib/libssl/src/ssl/s3_cbc.c
index 824ccf983b8..414d493150d 100644
--- a/lib/libssl/src/ssl/s3_cbc.c
+++ b/lib/libssl/src/ssl/s3_cbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_cbc.c,v 1.11 2015/09/11 17:17:44 jsing Exp $ */
+/* $OpenBSD: s3_cbc.c,v 1.12 2016/03/20 16:50:29 krw Exp $ */
/* ====================================================================
* Copyright (c) 2012 The OpenSSL Project. All rights reserved.
*
@@ -601,7 +601,7 @@ ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, unsigned char* md_out,
* application data, and we are at the offset for the
* 0x80 value, then overwrite b with 0x80. */
b = (b&~is_past_c) | (0x80&is_past_c);
- /* If this the the block containing the end of the
+ /* If this is the block containing the end of the
* application data and we're past the 0x80 value then
* just write zero. */
b = b&~is_past_cp1;
diff --git a/sys/lib/libkern/arch/amd64/strlen.S b/sys/lib/libkern/arch/amd64/strlen.S
index fd3fd5c95dc..1528ad3eb67 100644
--- a/sys/lib/libkern/arch/amd64/strlen.S
+++ b/sys/lib/libkern/arch/amd64/strlen.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: strlen.S,v 1.4 2014/12/09 15:13:57 reyk Exp $ */
+/* $OpenBSD: strlen.S,v 1.5 2016/03/20 16:50:30 krw Exp $ */
/* $NetBSD: strlen.S,v 1.6 2014/03/22 19:16:34 jakllsch Exp $ */
/*-
@@ -97,7 +97,7 @@
* presented above, code that uses it will be faster as long as
* the rate of false positives is low.
*
- * This is likely, because the the false positive can only occur
+ * This is likely, because the false positive can only occur
* if the most siginificant bit of a byte within the word is set.
* The expression will never fail for typical 7-bit ASCII strings.
*
diff --git a/usr.bin/mandoc/term.c b/usr.bin/mandoc/term.c
index d0cfa645343..822872c3323 100644
--- a/usr.bin/mandoc/term.c
+++ b/usr.bin/mandoc/term.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: term.c,v 1.116 2016/01/07 21:03:23 schwarze Exp $ */
+/* $OpenBSD: term.c,v 1.117 2016/03/20 16:50:30 krw Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -158,7 +158,7 @@ term_flushln(struct termp *p)
if (' ' == p->buf[j] || '\t' == p->buf[j])
break;
- /* Back over the the last printed character. */
+ /* Back over the last printed character. */
if (8 == p->buf[j]) {
assert(j);
vend -= (*p->width)(p, p->buf[j - 1]);