Skip to content

Commit

Permalink
merged
Browse files Browse the repository at this point in the history
  • Loading branch information
@djmdjm
djmdjm committed Jan 24, 2020
1 parent 02a458f commit b833228
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 48 deletions.
34 changes: 17 additions & 17 deletions CVS/Entries
View file
Expand Up @@ -212,14 +212,8 @@ D/ssh-sk-helper////
/auth2-pubkey.c/1.98/Thu Jan 23 21:53:41 2020//
/cipher-chachapoly.c/1.8/Thu Jan 23 23:19:11 2020//
/cipher-chachapoly.h/1.4/Thu Jan 23 23:19:11 2020//
/cipher.c/1.114/Thu Jan 23 23:19:11 2020//
/cipher.h/1.55/Thu Jan 23 21:53:41 2020//
/kex.c/1.156/Thu Jan 23 21:53:41 2020//
/misc.c/1.144/Thu Jan 23 21:53:41 2020//
/misc.h/1.83/Thu Jan 23 21:53:41 2020//
/monitor.c/1.207/Thu Jan 23 21:53:41 2020//
/mux.c/1.81/Thu Jan 23 21:53:41 2020//
/packet.c/1.289/Thu Jan 23 21:53:41 2020//
/progressmeter.c/1.50/Thu Jan 23 21:53:41 2020//
/readconf.h/1.132/Thu Jan 23 21:53:41 2020//
/scp.c/1.207/Thu Jan 23 21:53:41 2020//
Expand All @@ -229,29 +223,35 @@ D/ssh-sk-helper////
/ssh-sk-client.c/1.7/Thu Jan 23 21:53:41 2020//
/sshbuf.c/1.14/Thu Jan 23 21:53:41 2020//
/sshconnect.c/1.327/Thu Jan 23 21:53:41 2020//
/sshconnect2.c/1.318/Thu Jan 23 21:53:41 2020//
/sshsig.c/1.11/Thu Jan 23 23:38:44 2020//
/sshsig.h/1.7/Thu Jan 23 23:38:44 2020//
/auth.c/1.145/Fri Jan 24 05:15:57 2020//
/clientloop.c/1.332/Fri Jan 24 01:34:09 2020//
/hostfile.c/1.76/Fri Jan 24 01:34:09 2020//
/readconf.c/1.322/Fri Jan 24 01:34:09 2020//
/servconf.c/1.359/Fri Jan 24 05:15:57 2020//
/servconf.h/1.142/Fri Jan 24 05:15:57 2020//
/sshd.c/1.544/Fri Jan 24 05:15:57 2020//
/sshd_config.5/1.298/Fri Jan 24 05:15:58 2020//
/myproposal.h/1.67/Fri Jan 24 05:29:47 2020//
/ssh-keygen.1/1.196/Fri Jan 24 05:29:47 2020//
/Makefile.inc/1.81/Fri Jan 24 06:47:00 2020//
/readpass.c/1.61/Fri Jan 24 22:40:53 2020//
/ssh-add.1/1.78/Fri Jan 24 22:40:53 2020//
/ssh-agent.c/1.252/Fri Jan 24 07:09:38 2020//
/ssh-keygen.c/1.391/Fri Jan 24 07:09:38 2020//
/ssh-pkcs11-client.c/1.15/Fri Jan 24 07:09:38 2020//
/ssh-pkcs11-helper.c/1.21/Fri Jan 24 07:09:38 2020//
/ssh-pkcs11.c/1.46/Fri Jan 24 07:09:38 2020//
/ssh-pkcs11.h/1.5/Fri Jan 24 07:09:38 2020//
/ssh.1/1.409/Fri Jan 24 22:40:53 2020//
/ssh.c/1.513/Fri Jan 24 07:09:38 2020//
/sshkey.c/1.99/Fri Jan 24 06:30:04 2020//
/sshkey.h/1.44/Fri Jan 24 05:41:47 2020//
/Makefile.inc/1.81/Fri Jan 24 22:41:42 2020//
/cipher.c/1.114/Fri Jan 24 22:41:42 2020//
/cipher.h/1.55/Fri Jan 24 22:41:42 2020//
/kex.c/1.156/Fri Jan 24 22:41:42 2020//
/myproposal.h/1.67/Fri Jan 24 22:41:42 2020//
/packet.c/1.289/Fri Jan 24 22:41:42 2020//
/readconf.c/1.322/Fri Jan 24 22:41:42 2020//
/servconf.c/1.359/Fri Jan 24 22:41:42 2020//
/ssh-keygen.1/1.196/Fri Jan 24 22:41:42 2020//
/ssh-keygen.c/1.391/Fri Jan 24 22:41:42 2020//
/ssh.c/1.513/Fri Jan 24 22:41:42 2020//
/sshconnect2.c/1.318/Fri Jan 24 22:41:42 2020//
/sshsig.c/1.11/Fri Jan 24 22:41:42 2020//
/sshsig.h/1.7/Fri Jan 24 22:41:42 2020//
/misc.c/1.145/Fri Jan 24 23:54:40 2020//
/misc.h/1.84/Fri Jan 24 23:54:40 2020//
/sshd.c/1.545/Fri Jan 24 23:56:01 2020//
29 changes: 28 additions & 1 deletion misc.c
View file
@@ -1,4 +1,4 @@
/* $OpenBSD: misc.c,v 1.144 2020/01/23 07:10:22 dtucker Exp $ */
/* $OpenBSD: misc.c,v 1.145 2020/01/24 23:54:40 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2005,2006 Damien Miller. All rights reserved.
Expand Down Expand Up @@ -1202,6 +1202,33 @@ tohex(const void *vp, size_t l)
return (r);
}

/*
* Extend string *sp by the specified format. If *sp is not NULL (or empty),
* then the separator 'sep' will be prepended before the formatted arguments.
* Extended strings are heap allocated.
*/
void
xextendf(char **sp, const char *sep, const char *fmt, ...)
{
va_list ap;
char *tmp1, *tmp2;

va_start(ap, fmt);
xvasprintf(&tmp1, fmt, ap);
va_end(ap);

if (*sp == NULL || **sp == '\0') {
free(*sp);
*sp = tmp1;
return;
}
xasprintf(&tmp2, "%s%s%s", *sp, sep == NULL ? "" : sep, tmp1);
free(tmp1);
free(*sp);
*sp = tmp2;
}


u_int64_t
get_u64(const void *vp)
{
Expand Down
4 changes: 3 additions & 1 deletion misc.h
View file
@@ -1,4 +1,4 @@
/* $OpenBSD: misc.h,v 1.83 2020/01/23 07:10:22 dtucker Exp $ */
/* $OpenBSD: misc.h,v 1.84 2020/01/24 23:54:40 djm Exp $ */

/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
Expand Down Expand Up @@ -69,6 +69,8 @@ long convtime(const char *);
char *tilde_expand_filename(const char *, uid_t);
char *percent_expand(const char *, ...) __attribute__((__sentinel__));
char *tohex(const void *, size_t);
void xextendf(char **s, const char *sep, const char *fmt, ...)
__attribute__((__format__ (printf, 3, 4))) __attribute__((__nonnull__ (3)));
void sanitise_stdfd(void);
void ms_subtract_diff(struct timeval *, int *);
void ms_to_timeval(struct timeval *, int);
Expand Down
2 changes: 1 addition & 1 deletion ssh-keyscan/CVS/Entries
View file
@@ -1,2 +1,2 @@
/Makefile/1.16/Thu Jan 23 21:53:41 2020//
/Makefile/1.16/Fri Jan 24 22:41:42 2020//
D
2 changes: 1 addition & 1 deletion ssh-keysign/CVS/Entries
View file
@@ -1,2 +1,2 @@
/Makefile/1.19/Thu Jan 23 21:53:41 2020//
/Makefile/1.19/Fri Jan 24 22:41:42 2020//
D
2 changes: 1 addition & 1 deletion ssh/CVS/Entries
View file
@@ -1,2 +1,2 @@
/Makefile/1.80/Thu Jan 23 21:53:41 2020//
/Makefile/1.80/Fri Jan 24 22:41:42 2020//
D
26 changes: 1 addition & 25 deletions sshd.c
View file
@@ -1,4 +1,4 @@
/* $OpenBSD: sshd.c,v 1.544 2020/01/23 07:10:22 dtucker Exp $ */
/* $OpenBSD: sshd.c,v 1.545 2020/01/24 23:56:01 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
Expand Down Expand Up @@ -1349,30 +1349,6 @@ accumulate_host_timing_secret(struct sshbuf *server_cfg,
sshbuf_free(buf);
}

static void
xextendf(char **s, const char *sep, const char *fmt, ...)
__attribute__((__format__ (printf, 3, 4))) __attribute__((__nonnull__ (3)));
static void
xextendf(char **sp, const char *sep, const char *fmt, ...)
{
va_list ap;
char *tmp1, *tmp2;

va_start(ap, fmt);
xvasprintf(&tmp1, fmt, ap);
va_end(ap);

if (*sp == NULL || **sp == '\0') {
free(*sp);
*sp = tmp1;
return;
}
xasprintf(&tmp2, "%s%s%s", *sp, sep, tmp1);
free(tmp1);
free(*sp);
*sp = tmp2;
}

static char *
prepare_proctitle(int ac, char **av)
{
Expand Down
2 changes: 1 addition & 1 deletion sshd/CVS/Entries
View file
@@ -1,2 +1,2 @@
/Makefile/1.103/Thu Jan 23 21:53:41 2020//
/Makefile/1.103/Fri Jan 24 22:41:42 2020//
D

0 comments on commit b833228

Please sign in to comment.