| diff -ur '--exclude=.*.un~' a/openssh-8.8p1+x509-13.2.3.diff b/openssh-8.8p1+x509-13.2.3.diff |
| --- a/openssh-8.8p1+x509-13.2.3.diff 2021-10-29 14:59:17.070546984 -0700 |
| +++ b/openssh-8.8p1+x509-13.2.3.diff 2021-10-29 14:59:55.086664489 -0700 |
| @@ -954,15 +954,16 @@ |
| char b[512]; |
| - size_t len = ssh_digest_bytes(SSH_DIGEST_SHA512); |
| - u_char *hash = xmalloc(len); |
| +- double delay; |
| + int digest_alg; |
| + size_t len; |
| + u_char *hash; |
| - double delay; |
| - |
| ++ double delay = 0; |
| ++ |
| + digest_alg = ssh_digest_maxbytes(); |
| + len = ssh_digest_bytes(digest_alg); |
| + hash = xmalloc(len); |
| -+ |
| + |
| (void)snprintf(b, sizeof b, "%llu%s", |
| (unsigned long long)options.timing_secret, user); |
| - if (ssh_digest_memory(SSH_DIGEST_SHA512, b, strlen(b), hash, len) != 0) |
| @@ -51859,12 +51860,11 @@ |
| |
| install-files: |
| $(MKDIR_P) $(DESTDIR)$(bindir) |
| -@@ -391,6 +372,8 @@ |
| +@@ -391,6 +372,7 @@ |
| $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 |
| $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 |
| $(MKDIR_P) $(DESTDIR)$(libexecdir) |
| + $(MKDIR_P) $(DESTDIR)$(sshcadir) |
| -+ $(MKDIR_P) $(DESTDIR)$(piddir) |
| $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) |
| $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) |
| $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) |
| @@ -71985,7 +71985,7 @@ |
| +if test "$sshd_type" = "pkix" ; then |
| + unset_arg='' |
| +else |
| -+ unset_arg=none |
| ++ unset_arg= |
| +fi |
| + |
| cat > $OBJ/sshd_config.i << _EOF |
| @@ -132360,16 +132360,6 @@ |
| +int asnmprintf(char **, size_t, int *, const char *, ...) |
| __attribute__((format(printf, 4, 5))); |
| void msetlocale(void); |
| -diff -ruN openssh-8.8p1/version.h openssh-8.8p1+x509-13.2.3/version.h |
| ---- openssh-8.8p1/version.h 2021-09-26 17:03:19.000000000 +0300 |
| -+++ openssh-8.8p1+x509-13.2.3/version.h 2021-10-23 16:27:00.000000000 +0300 |
| -@@ -2,5 +2,4 @@ |
| - |
| - #define SSH_VERSION "OpenSSH_8.8" |
| - |
| --#define SSH_PORTABLE "p1" |
| --#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |
| -+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" |
| diff -ruN openssh-8.8p1/version.m4 openssh-8.8p1+x509-13.2.3/version.m4 |
| --- openssh-8.8p1/version.m4 1970-01-01 02:00:00.000000000 +0200 |
| +++ openssh-8.8p1+x509-13.2.3/version.m4 2021-10-23 16:27:00.000000000 +0300 |
