From 4b7dd22b02b64b1ededd3c0e98a6e7ae21e31d38 Mon Sep 17 00:00:00 2001 From: "dtucker@openbsd.org" Date: Fri, 7 Jun 2019 14:18:48 +0000 Subject: [PATCH] upstream: Typo and spelling fixes in comments and error messages. Patch from knweiss at gmail.com via -portable. OpenBSD-Commit-ID: 2577465442f761a39703762c4f87a8dfcb918b4b --- channels.c | 4 ++-- packet.c | 4 ++-- readconf.c | 4 ++-- umac.h | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/channels.c b/channels.c index 674a6a001..30691c82f 100644 --- a/channels.c +++ b/channels.c @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.391 2019/05/10 18:55:17 florian Exp $ */ +/* $OpenBSD: channels.c,v 1.392 2019/06/07 14:18:48 dtucker Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -493,7 +493,7 @@ permission_set_get(struct ssh *ssh, int where) } } -/* Reutrns pointers to the specified forwarding list and its element count */ +/* Returns pointers to the specified forwarding list and its element count */ static void permission_set_get_array(struct ssh *ssh, int who, int where, struct permission ***permpp, u_int **npermpp) diff --git a/packet.c b/packet.c index 01d65c5dd..8333c7ca9 100644 --- a/packet.c +++ b/packet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.284 2019/04/18 07:32:57 dtucker Exp $ */ +/* $OpenBSD: packet.c,v 1.285 2019/06/07 14:18:48 dtucker Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -296,7 +296,7 @@ ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out) if (ssh == NULL) ssh = ssh_alloc_session_state(); if (ssh == NULL) { - error("%s: cound not allocate state", __func__); + error("%s: could not allocate state", __func__); return NULL; } state = ssh->state; diff --git a/readconf.c b/readconf.c index ec497e79f..c143fa2e2 100644 --- a/readconf.c +++ b/readconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.304 2019/03/01 02:08:50 djm Exp $ */ +/* $OpenBSD: readconf.c,v 1.305 2019/06/07 14:18:48 dtucker Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1206,7 +1206,7 @@ parse_int: if (!arg || *arg == '\0') fatal("%.200s line %d: Missing argument.", filename, linenum); if (*arg != '-' && !mac_valid(*arg == '+' ? arg + 1 : arg)) - fatal("%.200s line %d: Bad SSH2 Mac spec '%s'.", + fatal("%.200s line %d: Bad SSH2 MAC spec '%s'.", filename, linenum, arg ? arg : ""); if (*activep && options->macs == NULL) options->macs = xstrdup(arg); diff --git a/umac.h b/umac.h index 7fb770f8a..4651f0d5a 100644 --- a/umac.h +++ b/umac.h @@ -1,4 +1,4 @@ -/* $OpenBSD: umac.h,v 1.3 2013/07/22 12:20:02 djm Exp $ */ +/* $OpenBSD: umac.h,v 1.4 2019/06/07 14:18:48 dtucker Exp $ */ /* ----------------------------------------------------------------------- * * umac.h -- C Implementation UMAC Message Authentication @@ -39,7 +39,7 @@ * at http://www.esat.kuleuven.ac.be/~rijmen/rijndael/ (search for * "Barreto"). The only two files needed are rijndael-alg-fst.c and * rijndael-alg-fst.h. - * Brian Gladman's version is distributed with GNU Public lisence + * Brian Gladman's version is distributed with GNU Public license * and can be found at http://fp.gladman.plus.com/AES/index.htm. It * includes a fast IA-32 assembly version. * @@ -107,7 +107,7 @@ int uhash_update(uhash_ctx_t ctx, long len); int uhash_final(uhash_ctx_t ctx, - u_char ouput[]); + u_char output[]); int uhash(uhash_ctx_t ctx, u_char *input,