diff options
author | krw <> | 2016-03-20 16:50:29 +0000 |
---|---|---|
committer | krw <> | 2016-03-20 16:50:29 +0000 |
commit | b0d59af38cf8802ece4b23a2ed7c6271dd75137b (patch) | |
tree | 0b42d780771922548ed4c8debc8dd681316a9399 | |
parent | 2915fa70193d5bf5e6e22e036e5f141bca9f91e3 (diff) | |
download | openbsd-b0d59af38cf8802ece4b23a2ed7c6271dd75137b.tar.gz openbsd-b0d59af38cf8802ece4b23a2ed7c6271dd75137b.tar.bz2 openbsd-b0d59af38cf8802ece4b23a2ed7c6271dd75137b.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-- | src/lib/libcrypto/des/asm/des_enc.m4 | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/ec/ec_asn1.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/s3_cbc.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/des/asm/des_enc.m4 | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/ec/ec_asn1.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/doc/apps/ca.pod | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/doc/apps/dgst.pod | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/doc/apps/x509.pod | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/ssl/s3_cbc.c | 4 |
9 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/libcrypto/des/asm/des_enc.m4 b/src/lib/libcrypto/des/asm/des_enc.m4 index 68c162e5d8..b117735828 100644 --- a/src/lib/libcrypto/des/asm/des_enc.m4 +++ b/src/lib/libcrypto/des/asm/des_enc.m4 | |||
@@ -130,7 +130,7 @@ changequote({,}) | |||
130 | ! | 130 | ! |
131 | ! Loads key first round from address in parameter 5 to out0, out1. | 131 | ! Loads key first round from address in parameter 5 to out0, out1. |
132 | ! | 132 | ! |
133 | ! After the the original LibDES initial permutation, the resulting left | 133 | ! After the original LibDES initial permutation, the resulting left |
134 | ! is in the variable initially used for right and vice versa. The macro | 134 | ! is in the variable initially used for right and vice versa. The macro |
135 | ! implements the possibility to keep the halfs in the original registers. | 135 | ! implements the possibility to keep the halfs in the original registers. |
136 | ! | 136 | ! |
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c index adaff98b2f..3234e7a6f2 100644 --- a/src/lib/libcrypto/ec/ec_asn1.c +++ b/src/lib/libcrypto/ec/ec_asn1.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ec_asn1.c,v 1.21 2015/10/16 15:15:39 jsing Exp $ */ | 1 | /* $OpenBSD: ec_asn1.c,v 1.22 2016/03/20 16:50:29 krw Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -1019,7 +1019,7 @@ ec_asn1_group2pkparameters(const EC_GROUP * group, ECPKPARAMETERS * params) | |||
1019 | 1019 | ||
1020 | if (EC_GROUP_get_asn1_flag(group)) { | 1020 | if (EC_GROUP_get_asn1_flag(group)) { |
1021 | /* | 1021 | /* |
1022 | * use the asn1 OID to describe the the elliptic curve | 1022 | * use the asn1 OID to describe the elliptic curve |
1023 | * parameters | 1023 | * parameters |
1024 | */ | 1024 | */ |
1025 | tmp = EC_GROUP_get_curve_name(group); | 1025 | tmp = EC_GROUP_get_curve_name(group); |
diff --git a/src/lib/libssl/s3_cbc.c b/src/lib/libssl/s3_cbc.c index 824ccf983b..414d493150 100644 --- a/src/lib/libssl/s3_cbc.c +++ b/src/lib/libssl/s3_cbc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_cbc.c,v 1.11 2015/09/11 17:17:44 jsing Exp $ */ | 1 | /* $OpenBSD: s3_cbc.c,v 1.12 2016/03/20 16:50:29 krw Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2012 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2012 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -601,7 +601,7 @@ ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, unsigned char* md_out, | |||
601 | * application data, and we are at the offset for the | 601 | * application data, and we are at the offset for the |
602 | * 0x80 value, then overwrite b with 0x80. */ | 602 | * 0x80 value, then overwrite b with 0x80. */ |
603 | b = (b&~is_past_c) | (0x80&is_past_c); | 603 | b = (b&~is_past_c) | (0x80&is_past_c); |
604 | /* If this the the block containing the end of the | 604 | /* If this is the block containing the end of the |
605 | * application data and we're past the 0x80 value then | 605 | * application data and we're past the 0x80 value then |
606 | * just write zero. */ | 606 | * just write zero. */ |
607 | b = b&~is_past_cp1; | 607 | b = b&~is_past_cp1; |
diff --git a/src/lib/libssl/src/crypto/des/asm/des_enc.m4 b/src/lib/libssl/src/crypto/des/asm/des_enc.m4 index 68c162e5d8..b117735828 100644 --- a/src/lib/libssl/src/crypto/des/asm/des_enc.m4 +++ b/src/lib/libssl/src/crypto/des/asm/des_enc.m4 | |||
@@ -130,7 +130,7 @@ changequote({,}) | |||
130 | ! | 130 | ! |
131 | ! Loads key first round from address in parameter 5 to out0, out1. | 131 | ! Loads key first round from address in parameter 5 to out0, out1. |
132 | ! | 132 | ! |
133 | ! After the the original LibDES initial permutation, the resulting left | 133 | ! After the original LibDES initial permutation, the resulting left |
134 | ! is in the variable initially used for right and vice versa. The macro | 134 | ! is in the variable initially used for right and vice versa. The macro |
135 | ! implements the possibility to keep the halfs in the original registers. | 135 | ! implements the possibility to keep the halfs in the original registers. |
136 | ! | 136 | ! |
diff --git a/src/lib/libssl/src/crypto/ec/ec_asn1.c b/src/lib/libssl/src/crypto/ec/ec_asn1.c index adaff98b2f..3234e7a6f2 100644 --- a/src/lib/libssl/src/crypto/ec/ec_asn1.c +++ b/src/lib/libssl/src/crypto/ec/ec_asn1.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ec_asn1.c,v 1.21 2015/10/16 15:15:39 jsing Exp $ */ | 1 | /* $OpenBSD: ec_asn1.c,v 1.22 2016/03/20 16:50:29 krw Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -1019,7 +1019,7 @@ ec_asn1_group2pkparameters(const EC_GROUP * group, ECPKPARAMETERS * params) | |||
1019 | 1019 | ||
1020 | if (EC_GROUP_get_asn1_flag(group)) { | 1020 | if (EC_GROUP_get_asn1_flag(group)) { |
1021 | /* | 1021 | /* |
1022 | * use the asn1 OID to describe the the elliptic curve | 1022 | * use the asn1 OID to describe the elliptic curve |
1023 | * parameters | 1023 | * parameters |
1024 | */ | 1024 | */ |
1025 | tmp = EC_GROUP_get_curve_name(group); | 1025 | tmp = EC_GROUP_get_curve_name(group); |
diff --git a/src/lib/libssl/src/doc/apps/ca.pod b/src/lib/libssl/src/doc/apps/ca.pod index ecbe7954d6..42aa966bdc 100644 --- a/src/lib/libssl/src/doc/apps/ca.pod +++ b/src/lib/libssl/src/doc/apps/ca.pod | |||
@@ -88,7 +88,7 @@ section for information on the required format. | |||
88 | =item B<-infiles> | 88 | =item B<-infiles> |
89 | 89 | ||
90 | if present this should be the last option, all subsequent arguments | 90 | if present this should be the last option, all subsequent arguments |
91 | are assumed to the the names of files containing certificate requests. | 91 | are assumed to be the names of files containing certificate requests. |
92 | 92 | ||
93 | =item B<-out filename> | 93 | =item B<-out filename> |
94 | 94 | ||
diff --git a/src/lib/libssl/src/doc/apps/dgst.pod b/src/lib/libssl/src/doc/apps/dgst.pod index d8b2abc6fb..33fac4d207 100644 --- a/src/lib/libssl/src/doc/apps/dgst.pod +++ b/src/lib/libssl/src/doc/apps/dgst.pod | |||
@@ -86,7 +86,7 @@ see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)|openssl(1)>. | |||
86 | 86 | ||
87 | =item B<-verify filename> | 87 | =item B<-verify filename> |
88 | 88 | ||
89 | verify the signature using the the public key in "filename". | 89 | verify the signature using the public key in "filename". |
90 | The output is either "Verification OK" or "Verification Failure". | 90 | The output is either "Verification OK" or "Verification Failure". |
91 | 91 | ||
92 | =item B<-prverify filename> | 92 | =item B<-prverify filename> |
diff --git a/src/lib/libssl/src/doc/apps/x509.pod b/src/lib/libssl/src/doc/apps/x509.pod index 25471736a0..1e62ac956a 100644 --- a/src/lib/libssl/src/doc/apps/x509.pod +++ b/src/lib/libssl/src/doc/apps/x509.pod | |||
@@ -138,7 +138,7 @@ this option prevents output of the encoded version of the request. | |||
138 | 138 | ||
139 | =item B<-pubkey> | 139 | =item B<-pubkey> |
140 | 140 | ||
141 | outputs the the certificate's SubjectPublicKeyInfo block in PEM format. | 141 | outputs the certificate's SubjectPublicKeyInfo block in PEM format. |
142 | 142 | ||
143 | =item B<-modulus> | 143 | =item B<-modulus> |
144 | 144 | ||
diff --git a/src/lib/libssl/src/ssl/s3_cbc.c b/src/lib/libssl/src/ssl/s3_cbc.c index 824ccf983b..414d493150 100644 --- a/src/lib/libssl/src/ssl/s3_cbc.c +++ b/src/lib/libssl/src/ssl/s3_cbc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_cbc.c,v 1.11 2015/09/11 17:17:44 jsing Exp $ */ | 1 | /* $OpenBSD: s3_cbc.c,v 1.12 2016/03/20 16:50:29 krw Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2012 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2012 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -601,7 +601,7 @@ ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, unsigned char* md_out, | |||
601 | * application data, and we are at the offset for the | 601 | * application data, and we are at the offset for the |
602 | * 0x80 value, then overwrite b with 0x80. */ | 602 | * 0x80 value, then overwrite b with 0x80. */ |
603 | b = (b&~is_past_c) | (0x80&is_past_c); | 603 | b = (b&~is_past_c) | (0x80&is_past_c); |
604 | /* If this the the block containing the end of the | 604 | /* If this is the block containing the end of the |
605 | * application data and we're past the 0x80 value then | 605 | * application data and we're past the 0x80 value then |
606 | * just write zero. */ | 606 | * just write zero. */ |
607 | b = b&~is_past_cp1; | 607 | b = b&~is_past_cp1; |