diff options
| -rwxr-xr-x | lib/libssl/src/crypto/sha/asm/sha512-ppc.pl | 2 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/efi/include/efinet.h | 2 | ||||
| -rw-r--r-- | sys/net/pipex_local.h | 4 | ||||
| -rw-r--r-- | sys/uvm/uvm_map.c | 4 | ||||
| -rw-r--r-- | usr.bin/openssl/apps.c | 4 | ||||
| -rw-r--r-- | usr.bin/openssl/req.c | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/lib/libssl/src/crypto/sha/asm/sha512-ppc.pl b/lib/libssl/src/crypto/sha/asm/sha512-ppc.pl index f561f313c69..2a7d5a0e8bc 100755 --- a/lib/libssl/src/crypto/sha/asm/sha512-ppc.pl +++ b/lib/libssl/src/crypto/sha/asm/sha512-ppc.pl @@ -20,7 +20,7 @@ # # (*) 64-bit code in 32-bit application context, which actually is # on TODO list. It should be noted that for safe deployment in -# 32-bit *mutli-threaded* context asynchronous signals should be +# 32-bit *multi-threaded* context asynchronous signals should be # blocked upon entry to SHA512 block routine. This is because # 32-bit signaling procedure invalidates upper halves of GPRs. # Context switch procedure preserves them, but not signaling:-( diff --git a/sys/arch/amd64/stand/efi/include/efinet.h b/sys/arch/amd64/stand/efi/include/efinet.h index 49a80e9ff84..4dc315b69c0 100644 --- a/sys/arch/amd64/stand/efi/include/efinet.h +++ b/sys/arch/amd64/stand/efi/include/efinet.h @@ -77,7 +77,7 @@ typedef struct { UINT64 RxBroadcastFrames; // - // Number of valid mutlicast frames received and not dropped. + // Number of valid multicast frames received and not dropped. // UINT64 RxMulticastFrames; diff --git a/sys/net/pipex_local.h b/sys/net/pipex_local.h index 86685532ea1..11b0b8ca215 100644 --- a/sys/net/pipex_local.h +++ b/sys/net/pipex_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex_local.h,v 1.22 2015/04/23 09:45:24 dlg Exp $ */ +/* $OpenBSD: pipex_local.h,v 1.23 2015/11/14 14:53:13 miod Exp $ */ /* * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -166,7 +166,7 @@ struct pipex_session { uint16_t ip_forward:1, /* {en|dis}ableIP forwarding */ ip6_forward:1, /* {en|dis}able IPv6 forwarding */ - is_multicast:1, /* virtual entry for mutlicast */ + is_multicast:1, /* virtual entry for multicast */ reserved:13; uint16_t protocol; /* tunnel protocol (PK) */ uint16_t session_id; /* session-id (PK) */ diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c index ec462419442..24d9168355e 100644 --- a/sys/uvm/uvm_map.c +++ b/sys/uvm/uvm_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_map.c,v 1.203 2015/11/11 15:59:33 mmcc Exp $ */ +/* $OpenBSD: uvm_map.c,v 1.204 2015/11/14 14:53:14 miod Exp $ */ /* $NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $ */ /* @@ -4272,7 +4272,7 @@ deactivate_it: break; case PGO_FREE: /* - * If there are mutliple references to + * If there are multiple references to * the amap, just deactivate the page. */ if (amap_refs(amap) > 1) diff --git a/usr.bin/openssl/apps.c b/usr.bin/openssl/apps.c index c2b786d3f9d..153504c5035 100644 --- a/usr.bin/openssl/apps.c +++ b/usr.bin/openssl/apps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apps.c,v 1.36 2015/09/13 12:41:01 bcook Exp $ */ +/* $OpenBSD: apps.c,v 1.37 2015/11/14 14:53:14 miod Exp $ */ /* * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> * @@ -1801,7 +1801,7 @@ parse_name(char *subject, long chtype, int multirdn) mval[ne_num + 1] = 0; break; } else if (*sp == '+' && multirdn) { - /* a not escaped + signals a mutlivalued RDN */ + /* a not escaped + signals a multivalued RDN */ sp++; mval[ne_num + 1] = -1; break; diff --git a/usr.bin/openssl/req.c b/usr.bin/openssl/req.c index 3a52f588310..e2648703743 100644 --- a/usr.bin/openssl/req.c +++ b/usr.bin/openssl/req.c @@ -1,4 +1,4 @@ -/* $OpenBSD: req.c,v 1.12 2015/10/17 15:00:11 doug Exp $ */ +/* $OpenBSD: req.c,v 1.13 2015/11/14 14:53:14 miod Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -120,7 +120,7 @@ * require. This format is wrong */ -static int make_REQ(X509_REQ * req, EVP_PKEY * pkey, char *dn, int mutlirdn, +static int make_REQ(X509_REQ * req, EVP_PKEY * pkey, char *dn, int multirdn, int attribs, unsigned long chtype); static int build_subject(X509_REQ * req, char *subj, unsigned long chtype, int multirdn); |