| 1 |
commit: a224ec97fc8b9df416904257927185c3402dcad6 |
| 2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 29 22:04:46 2021 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 29 22:05:00 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a224ec97 |
| 7 |
|
| 8 |
net-misc/openssh: Revbump, fix bug in X509 patchset |
| 9 |
|
| 10 |
In user_specific_delay, the X509 patch adds a conditional that makes it the |
| 11 |
delay could be uninitialized in some cases. This results in random hangs |
| 12 |
when attempting to log in to the server. Fix this by initializing to 0. |
| 13 |
|
| 14 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 15 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 16 |
|
| 17 |
.../files/openssh-8.8_p1-X509-glue-13.2.3.patch | 30 ++++++++++++++++++---- |
| 18 |
...h-8.8_p1-r1.ebuild => openssh-8.8_p1-r2.ebuild} | 0 |
| 19 |
2 files changed, 25 insertions(+), 5 deletions(-) |
| 20 |
|
| 21 |
diff --git a/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch b/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch |
| 22 |
index 74f8a842e6b..b6827623cd6 100644 |
| 23 |
--- a/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch |
| 24 |
+++ b/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch |
| 25 |
@@ -1,7 +1,27 @@ |
| 26 |
diff -ur '--exclude=.*.un~' a/openssh-8.8p1+x509-13.2.3.diff b/openssh-8.8p1+x509-13.2.3.diff |
| 27 |
---- a/openssh-8.8p1+x509-13.2.3.diff 2021-10-25 10:23:20.264186260 -0700 |
| 28 |
-+++ b/openssh-8.8p1+x509-13.2.3.diff 2021-10-25 10:24:35.924443287 -0700 |
| 29 |
-@@ -51859,12 +51859,11 @@ |
| 30 |
+--- a/openssh-8.8p1+x509-13.2.3.diff 2021-10-29 14:59:17.070546984 -0700 |
| 31 |
++++ b/openssh-8.8p1+x509-13.2.3.diff 2021-10-29 14:59:55.086664489 -0700 |
| 32 |
+@@ -954,15 +954,16 @@ |
| 33 |
+ char b[512]; |
| 34 |
+ - size_t len = ssh_digest_bytes(SSH_DIGEST_SHA512); |
| 35 |
+ - u_char *hash = xmalloc(len); |
| 36 |
++- double delay; |
| 37 |
+ + int digest_alg; |
| 38 |
+ + size_t len; |
| 39 |
+ + u_char *hash; |
| 40 |
+- double delay; |
| 41 |
+- |
| 42 |
+++ double delay = 0; |
| 43 |
+++ |
| 44 |
+ + digest_alg = ssh_digest_maxbytes(); |
| 45 |
+ + len = ssh_digest_bytes(digest_alg); |
| 46 |
+ + hash = xmalloc(len); |
| 47 |
+-+ |
| 48 |
++ |
| 49 |
+ (void)snprintf(b, sizeof b, "%llu%s", |
| 50 |
+ (unsigned long long)options.timing_secret, user); |
| 51 |
+ - if (ssh_digest_memory(SSH_DIGEST_SHA512, b, strlen(b), hash, len) != 0) |
| 52 |
+@@ -51859,12 +51860,11 @@ |
| 53 |
|
| 54 |
install-files: |
| 55 |
$(MKDIR_P) $(DESTDIR)$(bindir) |
| 56 |
@@ -15,7 +35,7 @@ diff -ur '--exclude=.*.un~' a/openssh-8.8p1+x509-13.2.3.diff b/openssh-8.8p1+x50 |
| 57 |
$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) |
| 58 |
$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) |
| 59 |
$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) |
| 60 |
-@@ -71985,7 +71984,7 @@ |
| 61 |
+@@ -71985,7 +71985,7 @@ |
| 62 |
+if test "$sshd_type" = "pkix" ; then |
| 63 |
+ unset_arg='' |
| 64 |
+else |
| 65 |
@@ -24,7 +44,7 @@ diff -ur '--exclude=.*.un~' a/openssh-8.8p1+x509-13.2.3.diff b/openssh-8.8p1+x50 |
| 66 |
+fi |
| 67 |
+ |
| 68 |
cat > $OBJ/sshd_config.i << _EOF |
| 69 |
-@@ -132360,16 +132359,6 @@ |
| 70 |
+@@ -132360,16 +132360,6 @@ |
| 71 |
+int asnmprintf(char **, size_t, int *, const char *, ...) |
| 72 |
__attribute__((format(printf, 4, 5))); |
| 73 |
void msetlocale(void); |
| 74 |
|
| 75 |
diff --git a/net-misc/openssh/openssh-8.8_p1-r1.ebuild b/net-misc/openssh/openssh-8.8_p1-r2.ebuild |
| 76 |
similarity index 100% |
| 77 |
rename from net-misc/openssh/openssh-8.8_p1-r1.ebuild |
| 78 |
rename to net-misc/openssh/openssh-8.8_p1-r2.ebuild |
Archives