| diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.1.diff b/openssh-8.9p1+x509-13.3.1.diff |
| --- a/openssh-8.9p1+x509-13.3.1.diff 2022-03-05 21:49:32.673126122 -0800 |
| +++ b/openssh-8.9p1+x509-13.3.1.diff 2022-03-05 21:52:52.581776560 -0800 |
| @@ -1002,15 +1002,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) |
| @@ -44746,8 +44747,8 @@ |
| gss_create_empty_oid_set(&status, &oidset); |
| gss_add_oid_set_member(&status, ctx->oid, &oidset); |
| |
| -- if (gethostname(lname, MAXHOSTNAMELEN)) { |
| -+ if (gethostname(lname, MAXHOSTNAMELEN) == -1) { |
| +- if (gethostname(lname, HOST_NAME_MAX)) { |
| ++ if (gethostname(lname, HOST_NAME_MAX) == -1) { |
| gss_release_oid_set(&status, &oidset); |
| return (-1); |
| } |
| @@ -52143,7 +52144,7 @@ |
| diff -ruN openssh-8.9p1/m4/openssh.m4 openssh-8.9p1+x509-13.3.1/m4/openssh.m4 |
| --- openssh-8.9p1/m4/openssh.m4 2022-02-23 13:31:11.000000000 +0200 |
| +++ openssh-8.9p1+x509-13.3.1/m4/openssh.m4 1970-01-01 02:00:00.000000000 +0200 |
| -@@ -1,200 +0,0 @@ |
| +@@ -1,203 +0,0 @@ |
| -dnl OpenSSH-specific autoconf macros |
| -dnl |
| - |
| @@ -52160,6 +52161,8 @@ |
| - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ |
| -#include <stdlib.h> |
| -#include <stdio.h> |
| +-/* Trivial function to help test for -fzero-call-used-regs */ |
| +-void f(int n) {} |
| -int main(int argc, char **argv) { |
| - (void)argv; |
| - /* Some math to catch -ftrapv problems in the toolchain */ |
| @@ -52167,6 +52170,7 @@ |
| - float l = i * 2.1; |
| - double m = l / 0.5; |
| - long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; |
| +- f(0); |
| - printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); |
| - /* |
| - * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does |
| @@ -52884,12 +52888,11 @@ |
| |
| install-files: |
| $(MKDIR_P) $(DESTDIR)$(bindir) |
| -@@ -396,6 +372,8 @@ |
| +@@ -396,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) |
| @@ -73836,7 +73839,7 @@ |
| +if test "$sshd_type" = "pkix" ; then |
| + unset_arg='' |
| +else |
| -+ unset_arg=none |
| ++ unset_arg= |
| +fi |
| + |
| cat > $OBJ/sshd_config.i << _EOF |
| @@ -79691,25 +79694,6 @@ |
| #ifdef __NR_getrandom |
| SC_ALLOW(__NR_getrandom), |
| #endif |
| -@@ -267,15 +273,15 @@ |
| - #ifdef __NR_clock_nanosleep_time64 |
| - SC_ALLOW(__NR_clock_nanosleep_time64), |
| - #endif |
| --#ifdef __NR_clock_gettime64 |
| -- SC_ALLOW(__NR_clock_gettime64), |
| --#endif |
| - #ifdef __NR__newselect |
| - SC_ALLOW(__NR__newselect), |
| - #endif |
| - #ifdef __NR_ppoll |
| - SC_ALLOW(__NR_ppoll), |
| - #endif |
| -+#ifdef __NR_ppoll_time64 |
| -+ SC_ALLOW(__NR_ppoll_time64), |
| -+#endif |
| - #ifdef __NR_poll |
| - SC_ALLOW(__NR_poll), |
| - #endif |
| @@ -288,6 +294,9 @@ |
| #ifdef __NR_read |
| SC_ALLOW(__NR_read), |
| @@ -137848,16 +137832,6 @@ |
| +int asnmprintf(char **, size_t, int *, const char *, ...) |
| __attribute__((format(printf, 4, 5))); |
| void msetlocale(void); |
| -diff -ruN openssh-8.9p1/version.h openssh-8.9p1+x509-13.3.1/version.h |
| ---- openssh-8.9p1/version.h 2022-02-23 13:31:11.000000000 +0200 |
| -+++ openssh-8.9p1+x509-13.3.1/version.h 2022-03-05 10:07:00.000000000 +0200 |
| -@@ -2,5 +2,4 @@ |
| - |
| - #define SSH_VERSION "OpenSSH_8.9" |
| - |
| --#define SSH_PORTABLE "p1" |
| --#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |
| -+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" |
| diff -ruN openssh-8.9p1/version.m4 openssh-8.9p1+x509-13.3.1/version.m4 |
| --- openssh-8.9p1/version.m4 1970-01-01 02:00:00.000000000 +0200 |
| +++ openssh-8.9p1+x509-13.3.1/version.m4 2022-03-05 10:07:00.000000000 +0200 |