summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libcrypto/bn/bn_lib.c4
-rw-r--r--src/lib/libcrypto/dso/dso.h4
-rw-r--r--src/lib/libcrypto/sha/asm/sha1-mips.pl2
-rw-r--r--src/lib/libcrypto/sha/sha_locl.h4
-rw-r--r--src/lib/libcrypto/whrlpool/wp_block.c4
-rw-r--r--src/lib/libssl/src/crypto/bn/bn_lib.c4
-rw-r--r--src/lib/libssl/src/crypto/dso/dso.h4
-rw-r--r--src/lib/libssl/src/crypto/sha/asm/sha1-mips.pl2
-rw-r--r--src/lib/libssl/src/crypto/sha/sha_locl.h4
-rw-r--r--src/lib/libssl/src/crypto/whrlpool/wp_block.c4
10 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/libcrypto/bn/bn_lib.c b/src/lib/libcrypto/bn/bn_lib.c
index 311ec2044d..17f4ae89da 100644
--- a/src/lib/libcrypto/bn/bn_lib.c
+++ b/src/lib/libcrypto/bn/bn_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bn_lib.c,v 1.35 2016/03/04 16:23:30 deraadt Exp $ */ 1/* $OpenBSD: bn_lib.c,v 1.36 2016/03/15 20:50:22 krw Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -295,7 +295,7 @@ bn_expand_internal(const BIGNUM *b, int words)
295 * The fact that the loop is unrolled 295 * The fact that the loop is unrolled
296 * 4-wise is a tribute to Intel. It's 296 * 4-wise is a tribute to Intel. It's
297 * the one that doesn't have enough 297 * the one that doesn't have enough
298 * registers to accomodate more data. 298 * registers to accommodate more data.
299 * I'd unroll it 8-wise otherwise:-) 299 * I'd unroll it 8-wise otherwise:-)
300 * 300 *
301 * <appro@fy.chalmers.se> 301 * <appro@fy.chalmers.se>
diff --git a/src/lib/libcrypto/dso/dso.h b/src/lib/libcrypto/dso/dso.h
index 42de08089e..6c982c9f97 100644
--- a/src/lib/libcrypto/dso/dso.h
+++ b/src/lib/libcrypto/dso/dso.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: dso.h,v 1.11 2015/02/07 13:19:15 doug Exp $ */ 1/* $OpenBSD: dso.h,v 1.12 2016/03/15 20:50:22 krw Exp $ */
2/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL 2/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -286,7 +286,7 @@ DSO_METHOD *DSO_METHOD_dlfcn(void);
286 * returns the number of characters [including trailing zero] 286 * returns the number of characters [including trailing zero]
287 * written to it. If 'sz' is 0 or negative, 'path' is ignored and 287 * written to it. If 'sz' is 0 or negative, 'path' is ignored and
288 * required amount of charachers [including trailing zero] to 288 * required amount of charachers [including trailing zero] to
289 * accomodate pathname is returned. If 'addr' is NULL, then 289 * accommodate pathname is returned. If 'addr' is NULL, then
290 * pathname of cryptolib itself is returned. Negative or zero 290 * pathname of cryptolib itself is returned. Negative or zero
291 * return value denotes error. 291 * return value denotes error.
292 */ 292 */
diff --git a/src/lib/libcrypto/sha/asm/sha1-mips.pl b/src/lib/libcrypto/sha/asm/sha1-mips.pl
index 0590b7cdb2..75fe7113e2 100644
--- a/src/lib/libcrypto/sha/asm/sha1-mips.pl
+++ b/src/lib/libcrypto/sha/asm/sha1-mips.pl
@@ -233,7 +233,7 @@ $code.=<<___ if ($i<79);
233___ 233___
234} 234}
235 235
236$FRAMESIZE=16; # large enough to accomodate NUBI saved registers 236$FRAMESIZE=16; # large enough to accommodate NUBI saved registers
237$SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0xc0fff008 : 0xc0ff0000; 237$SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0xc0fff008 : 0xc0ff0000;
238 238
239$code=<<___; 239$code=<<___;
diff --git a/src/lib/libcrypto/sha/sha_locl.h b/src/lib/libcrypto/sha/sha_locl.h
index f56ac5b9b7..d871a3b69d 100644
--- a/src/lib/libcrypto/sha/sha_locl.h
+++ b/src/lib/libcrypto/sha/sha_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sha_locl.h,v 1.20 2015/09/13 21:09:56 doug Exp $ */ 1/* $OpenBSD: sha_locl.h,v 1.21 2016/03/15 20:50:22 krw Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -163,7 +163,7 @@ int SHA1_Init(SHA_CTX *c)
163#ifndef MD32_XARRAY 163#ifndef MD32_XARRAY
164 /* 164 /*
165 * Originally X was an array. As it's automatic it's natural 165 * Originally X was an array. As it's automatic it's natural
166 * to expect RISC compiler to accomodate at least part of it in 166 * to expect RISC compiler to accommodate at least part of it in
167 * the register bank, isn't it? Unfortunately not all compilers 167 * the register bank, isn't it? Unfortunately not all compilers
168 * "find" this expectation reasonable:-( On order to make such 168 * "find" this expectation reasonable:-( On order to make such
169 * compilers generate better code I replace X[] with a bunch of 169 * compilers generate better code I replace X[] with a bunch of
diff --git a/src/lib/libcrypto/whrlpool/wp_block.c b/src/lib/libcrypto/whrlpool/wp_block.c
index d357e529ca..9a681c2888 100644
--- a/src/lib/libcrypto/whrlpool/wp_block.c
+++ b/src/lib/libcrypto/whrlpool/wp_block.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: wp_block.c,v 1.9 2014/07/09 16:06:13 miod Exp $ */ 1/* $OpenBSD: wp_block.c,v 1.10 2016/03/15 20:50:22 krw Exp $ */
2/** 2/**
3 * The Whirlpool hashing function. 3 * The Whirlpool hashing function.
4 * 4 *
@@ -115,7 +115,7 @@ typedef unsigned long long u64;
115 * one quadword load. One can argue that that many single-byte loads 115 * one quadword load. One can argue that that many single-byte loads
116 * is too excessive, as one could load a quadword and "milk" it for 116 * is too excessive, as one could load a quadword and "milk" it for
117 * eight 8-bit values instead. Well, yes, but in order to do so *and* 117 * eight 8-bit values instead. Well, yes, but in order to do so *and*
118 * avoid excessive loads you have to accomodate a handful of 64-bit 118 * avoid excessive loads you have to accommodate a handful of 64-bit
119 * values in the register bank and issue a bunch of shifts and mask. 119 * values in the register bank and issue a bunch of shifts and mask.
120 * It's a tradeoff: loads vs. shift and mask in big register bank[!]. 120 * It's a tradeoff: loads vs. shift and mask in big register bank[!].
121 * On most CPUs eight single-byte loads are faster and I let other 121 * On most CPUs eight single-byte loads are faster and I let other
diff --git a/src/lib/libssl/src/crypto/bn/bn_lib.c b/src/lib/libssl/src/crypto/bn/bn_lib.c
index 311ec2044d..17f4ae89da 100644
--- a/src/lib/libssl/src/crypto/bn/bn_lib.c
+++ b/src/lib/libssl/src/crypto/bn/bn_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bn_lib.c,v 1.35 2016/03/04 16:23:30 deraadt Exp $ */ 1/* $OpenBSD: bn_lib.c,v 1.36 2016/03/15 20:50:22 krw Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -295,7 +295,7 @@ bn_expand_internal(const BIGNUM *b, int words)
295 * The fact that the loop is unrolled 295 * The fact that the loop is unrolled
296 * 4-wise is a tribute to Intel. It's 296 * 4-wise is a tribute to Intel. It's
297 * the one that doesn't have enough 297 * the one that doesn't have enough
298 * registers to accomodate more data. 298 * registers to accommodate more data.
299 * I'd unroll it 8-wise otherwise:-) 299 * I'd unroll it 8-wise otherwise:-)
300 * 300 *
301 * <appro@fy.chalmers.se> 301 * <appro@fy.chalmers.se>
diff --git a/src/lib/libssl/src/crypto/dso/dso.h b/src/lib/libssl/src/crypto/dso/dso.h
index 42de08089e..6c982c9f97 100644
--- a/src/lib/libssl/src/crypto/dso/dso.h
+++ b/src/lib/libssl/src/crypto/dso/dso.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: dso.h,v 1.11 2015/02/07 13:19:15 doug Exp $ */ 1/* $OpenBSD: dso.h,v 1.12 2016/03/15 20:50:22 krw Exp $ */
2/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL 2/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -286,7 +286,7 @@ DSO_METHOD *DSO_METHOD_dlfcn(void);
286 * returns the number of characters [including trailing zero] 286 * returns the number of characters [including trailing zero]
287 * written to it. If 'sz' is 0 or negative, 'path' is ignored and 287 * written to it. If 'sz' is 0 or negative, 'path' is ignored and
288 * required amount of charachers [including trailing zero] to 288 * required amount of charachers [including trailing zero] to
289 * accomodate pathname is returned. If 'addr' is NULL, then 289 * accommodate pathname is returned. If 'addr' is NULL, then
290 * pathname of cryptolib itself is returned. Negative or zero 290 * pathname of cryptolib itself is returned. Negative or zero
291 * return value denotes error. 291 * return value denotes error.
292 */ 292 */
diff --git a/src/lib/libssl/src/crypto/sha/asm/sha1-mips.pl b/src/lib/libssl/src/crypto/sha/asm/sha1-mips.pl
index 0590b7cdb2..75fe7113e2 100644
--- a/src/lib/libssl/src/crypto/sha/asm/sha1-mips.pl
+++ b/src/lib/libssl/src/crypto/sha/asm/sha1-mips.pl
@@ -233,7 +233,7 @@ $code.=<<___ if ($i<79);
233___ 233___
234} 234}
235 235
236$FRAMESIZE=16; # large enough to accomodate NUBI saved registers 236$FRAMESIZE=16; # large enough to accommodate NUBI saved registers
237$SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0xc0fff008 : 0xc0ff0000; 237$SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0xc0fff008 : 0xc0ff0000;
238 238
239$code=<<___; 239$code=<<___;
diff --git a/src/lib/libssl/src/crypto/sha/sha_locl.h b/src/lib/libssl/src/crypto/sha/sha_locl.h
index f56ac5b9b7..d871a3b69d 100644
--- a/src/lib/libssl/src/crypto/sha/sha_locl.h
+++ b/src/lib/libssl/src/crypto/sha/sha_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sha_locl.h,v 1.20 2015/09/13 21:09:56 doug Exp $ */ 1/* $OpenBSD: sha_locl.h,v 1.21 2016/03/15 20:50:22 krw Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -163,7 +163,7 @@ int SHA1_Init(SHA_CTX *c)
163#ifndef MD32_XARRAY 163#ifndef MD32_XARRAY
164 /* 164 /*
165 * Originally X was an array. As it's automatic it's natural 165 * Originally X was an array. As it's automatic it's natural
166 * to expect RISC compiler to accomodate at least part of it in 166 * to expect RISC compiler to accommodate at least part of it in
167 * the register bank, isn't it? Unfortunately not all compilers 167 * the register bank, isn't it? Unfortunately not all compilers
168 * "find" this expectation reasonable:-( On order to make such 168 * "find" this expectation reasonable:-( On order to make such
169 * compilers generate better code I replace X[] with a bunch of 169 * compilers generate better code I replace X[] with a bunch of
diff --git a/src/lib/libssl/src/crypto/whrlpool/wp_block.c b/src/lib/libssl/src/crypto/whrlpool/wp_block.c
index d357e529ca..9a681c2888 100644
--- a/src/lib/libssl/src/crypto/whrlpool/wp_block.c
+++ b/src/lib/libssl/src/crypto/whrlpool/wp_block.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: wp_block.c,v 1.9 2014/07/09 16:06:13 miod Exp $ */ 1/* $OpenBSD: wp_block.c,v 1.10 2016/03/15 20:50:22 krw Exp $ */
2/** 2/**
3 * The Whirlpool hashing function. 3 * The Whirlpool hashing function.
4 * 4 *
@@ -115,7 +115,7 @@ typedef unsigned long long u64;
115 * one quadword load. One can argue that that many single-byte loads 115 * one quadword load. One can argue that that many single-byte loads
116 * is too excessive, as one could load a quadword and "milk" it for 116 * is too excessive, as one could load a quadword and "milk" it for
117 * eight 8-bit values instead. Well, yes, but in order to do so *and* 117 * eight 8-bit values instead. Well, yes, but in order to do so *and*
118 * avoid excessive loads you have to accomodate a handful of 64-bit 118 * avoid excessive loads you have to accommodate a handful of 64-bit
119 * values in the register bank and issue a bunch of shifts and mask. 119 * values in the register bank and issue a bunch of shifts and mask.
120 * It's a tradeoff: loads vs. shift and mask in big register bank[!]. 120 * It's a tradeoff: loads vs. shift and mask in big register bank[!].
121 * On most CPUs eight single-byte loads are faster and I let other 121 * On most CPUs eight single-byte loads are faster and I let other