The branch master has been updated
via afc901e0ec53cd98618ade030b67a1ff8337d9dd (commit)
via c9a41d7dd631a69b73bea8af714a3a8b872b8309 (commit)
from c67a2f80ec933465c54138fe829433d535651349 (commit)
- Log -----------------------------------------------------------------
commit afc901e0ec53cd98618ade030b67a1ff8337d9dd
Author: Johannes Bauer <j...@johannes-bauer.com>
Date: Sat Aug 5 10:53:42 2017 +0200
Small typo in manpage of x509(1)
Reviewed-by: Kurt Roeckx <k...@roeckx.be>
Reviewed-by: Andy Polyakov <ap...@openssl.org>
GH: #4090
commit c9a41d7dd631a69b73bea8af714a3a8b872b8309
Author: Xiaoyin Liu <xiaoy...@users.noreply.github.com>
Date: Fri Aug 4 01:10:41 2017 -0400
Fix typo in files in crypto folder
Reviewed-by: Kurt Roeckx <k...@roeckx.be>
Reviewed-by: Andy Polyakov <ap...@openssl.org>
GH: #4093
-----------------------------------------------------------------------
Summary of changes:
crypto/armcap.c | 4 ++--
crypto/ia64cpuid.S | 4 ++--
crypto/init.c | 4 ++--
crypto/o_time.c | 4 ++--
doc/man1/x509.pod | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/crypto/armcap.c b/crypto/armcap.c
index baa2d3d..b55a71e 100644
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2011-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -69,7 +69,7 @@ static unsigned long (*getauxval) (unsigned long) = NULL;
# endif
/*
- * ARM puts the the feature bits for Crypto Extensions in AT_HWCAP2, whereas
+ * ARM puts the feature bits for Crypto Extensions in AT_HWCAP2, whereas
* AArch64 used AT_HWCAP.
*/
# if defined(__arm__) || defined (__arm)
diff --git a/crypto/ia64cpuid.S b/crypto/ia64cpuid.S
index ffd6d6c..92c5512 100644
--- a/crypto/ia64cpuid.S
+++ b/crypto/ia64cpuid.S
@@ -1,4 +1,4 @@
-// Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved.
+// Copyright 2004-2017 The OpenSSL Project Authors. All Rights Reserved.
//
// Licensed under the OpenSSL license (the "License"). You may not use
// this file except in compliance with the License. You can obtain a copy
@@ -75,7 +75,7 @@ OPENSSL_wipe_cpu:
{ .mii; add r9=96*8-8,r9
mov ar.ec=1 };;
-// One can sweep double as fast, but then we can't quarantee
+// One can sweep double as fast, but then we can't guarantee
// that backing storage is wiped...
.L_wipe_top:
{ .mfi; st8 [r9]=r0,-8
diff --git a/crypto/init.c b/crypto/init.c
index b7c7715..e1ca88f 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -657,7 +657,7 @@ int OPENSSL_atexit(void (*handler)(void))
* Deliberately leak a reference to the handler. This will force the
* library/code containing the handler to remain loaded until we run
the
* atexit handler. If -znodelete has been used then this is
- * unneccessary.
+ * unnecessary.
*/
{
DSO *dso = NULL;
diff --git a/crypto/o_time.c b/crypto/o_time.c
index 3690232..b2fb38a 100644
--- a/crypto/o_time.c
+++ b/crypto/o_time.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -20,7 +20,7 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm
*result)
/*
* On VMS, gmtime_r() takes a 32-bit pointer as second argument.
* Since we can't know that |result| is in a space that can easily
- * translate to a 32-bit pointer, we must store temporarly on stack
+ * translate to a 32-bit pointer, we must store temporarily on stack
* and copy the result. The stack is always reachable with 32-bit
* pointers.
*/
diff --git a/doc/man1/x509.pod b/doc/man1/x509.pod
index 0b79560..5b2fc0e 100644
--- a/doc/man1/x509.pod
+++ b/doc/man1/x509.pod
@@ -703,7 +703,7 @@ Display the "Subject Alternative Name" extension of a
certificate:
openssl x509 -in cert.pem -noout -ext subjectAltName
-Display the more extensions of a certificate:
+Display more extensions of a certificate:
openssl x509 -in cert.pem -noout -ext subjectAltName,nsCertType
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
