From 001aa55484852370488786bd40e9fdad4b465811 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Tue, 10 Apr 2018 00:10:49 +0000 Subject: upstream: lots of typos in comments/docs. Patch from Karsten Weiss after checking with codespell tool (https://github.com/lucasdemarchi/codespell) OpenBSD-Commit-ID: 373222f12d7ab606598a2d36840c60be93568528 --- sshkey-xmss.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sshkey-xmss.c') diff --git a/sshkey-xmss.c b/sshkey-xmss.c index 5d66ee790..2c50f75f8 100644 --- a/sshkey-xmss.c +++ b/sshkey-xmss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey-xmss.c,v 1.1 2018/02/23 15:58:38 markus Exp $ */ +/* $OpenBSD: sshkey-xmss.c,v 1.2 2018/04/10 00:10:49 djm Exp $ */ /* * Copyright (c) 2017 Markus Friedl. All rights reserved. * @@ -66,7 +66,7 @@ struct ssh_xmss_state { treehash_inst *treehash; u_int32_t idx; /* state read from file */ - u_int32_t maxidx; /* resticted # of signatures */ + u_int32_t maxidx; /* restricted # of signatures */ int have_state; /* .state file exists */ int lockfd; /* locked in sshkey_xmss_get_state() */ int allow_update; /* allow sshkey_xmss_update_state() */ @@ -583,7 +583,7 @@ sshkey_xmss_update_state(const struct sshkey *k, sshkey_printfn *pr) } idx = PEEK_U32(k->xmss_sk); if (idx == state->idx) { - /* no signature happend, no need to update */ + /* no signature happened, no need to update */ ret = 0; goto done; } else if (idx != state->idx + 1) { -- cgit v1.2.3 From 49f47e656b60bcd1d1db98d88105295f4b4e600d Mon Sep 17 00:00:00 2001 From: "markus@openbsd.org" Date: Mon, 9 Jul 2018 21:59:10 +0000 Subject: upstream: replace cast with call to sshbuf_mutable_ptr(); ok djm@ OpenBSD-Commit-ID: 4dfe9d29fa93d9231645c89084f7217304f7ba29 --- authfd.c | 4 ++-- authfile.c | 4 ++-- msg.c | 4 ++-- ssh-keygen.c | 4 ++-- ssh-pkcs11-client.c | 4 ++-- sshkey-xmss.c | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'sshkey-xmss.c') diff --git a/authfd.c b/authfd.c index f24230b7c..ecdd869ab 100644 --- a/authfd.c +++ b/authfd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfd.c,v 1.110 2018/07/03 11:39:54 djm Exp $ */ +/* $OpenBSD: authfd.c,v 1.111 2018/07/09 21:59:10 markus Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -133,7 +133,7 @@ ssh_request_reply(int sock, struct sshbuf *request, struct sshbuf *reply) /* Send the length and then the packet to the agent. */ if (atomicio(vwrite, sock, buf, 4) != 4 || - atomicio(vwrite, sock, (u_char *)sshbuf_ptr(request), + atomicio(vwrite, sock, sshbuf_mutable_ptr(request), sshbuf_len(request)) != sshbuf_len(request)) return SSH_ERR_AGENT_COMMUNICATION; /* diff --git a/authfile.c b/authfile.c index c3a6345d3..be4a57736 100644 --- a/authfile.c +++ b/authfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.129 2018/06/06 18:29:18 markus Exp $ */ +/* $OpenBSD: authfile.c,v 1.130 2018/07/09 21:59:10 markus Exp $ */ /* * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. * @@ -59,7 +59,7 @@ sshkey_save_private_blob(struct sshbuf *keybuf, const char *filename) if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0600)) < 0) return SSH_ERR_SYSTEM_ERROR; - if (atomicio(vwrite, fd, (u_char *)sshbuf_ptr(keybuf), + if (atomicio(vwrite, fd, sshbuf_mutable_ptr(keybuf), sshbuf_len(keybuf)) != sshbuf_len(keybuf)) { oerrno = errno; close(fd); diff --git a/msg.c b/msg.c index 5a7b8ca91..1bd20f3d3 100644 --- a/msg.c +++ b/msg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msg.c,v 1.16 2015/01/15 09:40:00 djm Exp $ */ +/* $OpenBSD: msg.c,v 1.17 2018/07/09 21:59:10 markus Exp $ */ /* * Copyright (c) 2002 Markus Friedl. All rights reserved. * @@ -55,7 +55,7 @@ ssh_msg_send(int fd, u_char type, struct sshbuf *m) error("ssh_msg_send: write"); return (-1); } - if (atomicio(vwrite, fd, (u_char *)sshbuf_ptr(m), mlen) != mlen) { + if (atomicio(vwrite, fd, sshbuf_mutable_ptr(m), mlen) != mlen) { error("ssh_msg_send: write"); return (-1); } diff --git a/ssh-keygen.c b/ssh-keygen.c index ccebbaf76..822e7e7c4 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.317 2018/06/06 18:29:18 markus Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.318 2018/07/09 21:59:10 markus Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1994 Tatu Ylonen , Espoo, Finland @@ -2255,7 +2255,7 @@ do_gen_krl(struct passwd *pw, int updating, int argc, char **argv) fatal("Couldn't generate KRL"); if ((fd = open(identity_file, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1) fatal("open %s: %s", identity_file, strerror(errno)); - if (atomicio(vwrite, fd, (void *)sshbuf_ptr(kbuf), sshbuf_len(kbuf)) != + if (atomicio(vwrite, fd, sshbuf_mutable_ptr(kbuf), sshbuf_len(kbuf)) != sshbuf_len(kbuf)) fatal("write %s: %s", identity_file, strerror(errno)); close(fd); diff --git a/ssh-pkcs11-client.c b/ssh-pkcs11-client.c index 0544b0e86..028b272cb 100644 --- a/ssh-pkcs11-client.c +++ b/ssh-pkcs11-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-pkcs11-client.c,v 1.9 2018/07/09 20:39:28 markus Exp $ */ +/* $OpenBSD: ssh-pkcs11-client.c,v 1.10 2018/07/09 21:59:10 markus Exp $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. * @@ -57,7 +57,7 @@ send_msg(struct sshbuf *m) POKE_U32(buf, mlen); if (atomicio(vwrite, fd, buf, 4) != 4 || - atomicio(vwrite, fd, (u_char *)sshbuf_ptr(m), + atomicio(vwrite, fd, sshbuf_mutable_ptr(m), sshbuf_len(m)) != sshbuf_len(m)) error("write to helper failed"); if ((r = sshbuf_consume(m, mlen)) != 0) diff --git a/sshkey-xmss.c b/sshkey-xmss.c index 2c50f75f8..aaae70289 100644 --- a/sshkey-xmss.c +++ b/sshkey-xmss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey-xmss.c,v 1.2 2018/04/10 00:10:49 djm Exp $ */ +/* $OpenBSD: sshkey-xmss.c,v 1.3 2018/07/09 21:59:10 markus Exp $ */ /* * Copyright (c) 2017 Markus Friedl. All rights reserved. * @@ -625,7 +625,7 @@ sshkey_xmss_update_state(const struct sshkey *k, sshkey_printfn *pr) close(fd); goto done; } - if (atomicio(vwrite, fd, (void *)sshbuf_ptr(enc), sshbuf_len(enc)) != + if (atomicio(vwrite, fd, sshbuf_mutable_ptr(enc), sshbuf_len(enc)) != sshbuf_len(enc)) { ret = SSH_ERR_SYSTEM_ERROR; PRINT("%s: write new state file data: %s", __func__, nstatefile); -- cgit v1.2.3