[arch-commits] Commit in openssh/trunk (4 files)
Date: Friday, October 19, 2018 @ 06:56:22
Author: bisson
Revision: 336869
upstream update
Modified:
openssh/trunk/PKGBUILD
openssh/trunk/PKGBUILD.snap
Deleted:
openssh/trunk/openssl-1.1.0.patch
openssh/trunk/openssl.patch
-+
PKGBUILD| 13
PKGBUILD.snap |7
openssl-1.1.0.patch | 1950 --
openssl.patch | 12
4 files changed, 2 insertions(+), 1980 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-10-19 06:27:51 UTC (rev 336868)
+++ PKGBUILD2018-10-19 06:56:22 UTC (rev 336869)
@@ -3,7 +3,7 @@
# Contributor: judd
pkgname=openssh
-pkgver=7.8p1
+pkgver=7.9p1
pkgrel=1
pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
url='https://www.openssh.com/portable.html'
@@ -15,7 +15,6 @@
'x11-ssh-askpass: input passphrase in X')
validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
-'openssl-1.1.0.patch'
'sshdgenkeys.service'
'sshd@.service'
'sshd.service'
@@ -22,9 +21,8 @@
'sshd.socket'
'sshd.conf'
'sshd.pam')
-sha256sums=('1a484bb15152c183bb2514e112aa30dd34138c3cfb032eee5490a66c507144ca'
+sha256sums=('6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad'
'SKIP'
-'d92e3d759b4b5c536aaddf95891bf3baa3a589b4897c56b90103088e1d8f8ebd'
'4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
'3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'
'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'
@@ -34,13 +32,6 @@
backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # OpenSSL 1.1.0 patch from
http://vega.pgw.jp/~kabe/vsd/patch/openssh-7.4p1-openssl-1.1.0c.patch.html
- patch -p1 -i ../openssl-1.1.0.patch
-}
-
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
Modified: PKGBUILD.snap
===
--- PKGBUILD.snap 2018-10-19 06:27:51 UTC (rev 336868)
+++ PKGBUILD.snap 2018-10-19 06:56:22 UTC (rev 336869)
@@ -36,13 +36,6 @@
backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
-prepare() {
-# cd "${srcdir}/${pkgname}-${pkgver}"
- cd "${srcdir}/${pkgname}"
-
- patch -p1 -i ../openssl.patch
-}
-
build() {
# cd "${srcdir}/${pkgname}-${pkgver}"
cd "${srcdir}/${pkgname}"
Deleted: openssl-1.1.0.patch
===
--- openssl-1.1.0.patch 2018-10-19 06:27:51 UTC (rev 336868)
+++ openssl-1.1.0.patch 2018-10-19 06:56:22 UTC (rev 336869)
@@ -1,1950 +0,0 @@
-diff -aurp old/auth-pam.c new/auth-pam.c
old/auth-pam.c 2018-08-22 22:41:42.0 -0700
-+++ new/auth-pam.c 2018-08-23 21:31:53.324592767 -0700
-@@ -128,6 +128,10 @@ extern u_int utmp_len;
- typedef pthread_t sp_pthread_t;
- #else
- typedef pid_t sp_pthread_t;
-+# define pthread_create(a, b, c, d)_ssh_compat_pthread_create(a, b, c, d)
-+# define pthread_exit(a) _ssh_compat_pthread_exit(a)
-+# define pthread_cancel(a) _ssh_compat_pthread_cancel(a)
-+# define pthread_join(a, b)_ssh_compat_pthread_join(a, b)
- #endif
-
- struct pam_ctxt {
-diff -aurp old/cipher.c new/cipher.c
old/cipher.c 2018-08-22 22:41:42.0 -0700
-+++ new/cipher.c 2018-08-23 21:31:53.327926112 -0700
-@@ -299,7 +299,10 @@ cipher_init(struct sshcipher_ctx **ccp,
- goto out;
- }
- }
-- if (EVP_CipherInit(cc->evp, NULL, (u_char *)key, NULL, -1) == 0) {
-+ /* in OpenSSL 1.1.0, EVP_CipherInit clears all previous setups;
-+ use EVP_CipherInit_ex for augmenting */
-+ if (EVP_CipherInit_ex(cc->evp, NULL, NULL, (u_char *)key, NULL, -1) ==
0)
-+ {
- ret = SSH_ERR_LIBCRYPTO_ERROR;
- goto out;
- }
-@@ -485,7 +488,7 @@ cipher_get_keyiv(struct sshcipher_ctx *c
- len, iv))
- return SSH_ERR_LIBCRYPTO_ERROR;
- } else
-- memcpy(iv, cc->evp->iv, len);
-+ memcpy(iv, EVP_CIPHER_CTX_iv(cc->evp), len);
- #endif
- return 0;
- }
-@@ -519,14 +522,19 @@ cipher_set_keyiv(struct sshcipher_ctx *c
- EVP_CTRL_GCM_SET_IV_FIXED, -1, (void *)iv))
- return SSH_ERR_LIBCRYPTO_ERROR;
- } else
-- memcpy(cc->evp->iv, iv, evplen);
-+ memcpy(EVP_CIPHER_CTX_iv(cc->evp), iv, evplen);
- #endif
- return 0;
- }
-
- #ifdef WITH_OPENSSL
--#define EVP_X_STATE(evp) (evp)->cipher_data
--#define EVP_X_STATE_LEN(evp) (evp)->cipher->ctx_size
-+# if
[arch-commits] Commit in openssh/trunk (4 files)
Date: Friday, August 24, 2018 @ 05:02:21
Author: bisson
Revision: 332897
upstream update
Modified:
openssh/trunk/PKGBUILD
openssh/trunk/PKGBUILD.snap
openssh/trunk/openssl-1.1.0.patch
Deleted:
openssh/trunk/tuntap.patch
-+
PKGBUILD| 12 --
PKGBUILD.snap |2
openssl-1.1.0.patch | 203 --
tuntap.patch| 35
4 files changed, 105 insertions(+), 147 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-08-24 04:48:59 UTC (rev 332896)
+++ PKGBUILD2018-08-24 05:02:21 UTC (rev 332897)
@@ -4,8 +4,8 @@
# Contributor: judd
pkgname=openssh
-pkgver=7.7p1
-pkgrel=2
+pkgver=7.8p1
+pkgrel=1
pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
url='https://www.openssh.com/portable.html'
license=('custom:BSD')
@@ -17,7 +17,6 @@
validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
'openssl-1.1.0.patch'
-'tuntap.patch'
'sshdgenkeys.service'
'sshd@.service'
'sshd.service'
@@ -24,10 +23,9 @@
'sshd.socket'
'sshd.conf'
'sshd.pam')
-sha256sums=('d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f'
+sha256sums=('1a484bb15152c183bb2514e112aa30dd34138c3cfb032eee5490a66c507144ca'
'SKIP'
-'fa91849cc3161916f563bda5413676342e0bcc2705857e9d01b73c70e4904adf'
-'bd3698425ece4853d67a9f9e934d37ad22948754c9b82e0a872eb854e94220ce'
+'d92e3d759b4b5c536aaddf95891bf3baa3a589b4897c56b90103088e1d8f8ebd'
'4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
'3a0845737207f4eda221c9c9fb64e766ade9684562d8ba4f705f7ae6826886e5'
'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'
@@ -42,8 +40,6 @@
# OpenSSL 1.1.0 patch from
http://vega.pgw.jp/~kabe/vsd/patch/openssh-7.4p1-openssl-1.1.0c.patch.html
patch -p1 -i ../openssl-1.1.0.patch
-
- patch -p1 -i ../tuntap.patch
}
build() {
Modified: PKGBUILD.snap
===
--- PKGBUILD.snap 2018-08-24 04:48:59 UTC (rev 332896)
+++ PKGBUILD.snap 2018-08-24 05:02:21 UTC (rev 332897)
@@ -6,7 +6,7 @@
pkgname=openssh
pkgver=7.7snap20180330
pkgrel=1
-pkgdesc='Free version of the SSH connectivity tools'
+pkgdesc='Premier connectivity tool for remote login with the SSH protocol'
url='https://www.openssh.com/portable.html'
license=('custom:BSD')
arch=('x86_64')
Modified: openssl-1.1.0.patch
===
--- openssl-1.1.0.patch 2018-08-24 04:48:59 UTC (rev 332896)
+++ openssl-1.1.0.patch 2018-08-24 05:02:21 UTC (rev 332897)
@@ -1,6 +1,6 @@
diff -aurp old/auth-pam.c new/auth-pam.c
old/auth-pam.c 2018-03-22 16:21:14.0 -1000
-+++ new/auth-pam.c 2018-03-23 10:05:03.886621278 -1000
+--- old/auth-pam.c 2018-08-22 22:41:42.0 -0700
new/auth-pam.c 2018-08-23 21:31:53.324592767 -0700
@@ -128,6 +128,10 @@ extern u_int utmp_len;
typedef pthread_t sp_pthread_t;
#else
@@ -13,9 +13,9 @@
struct pam_ctxt {
diff -aurp old/cipher.c new/cipher.c
old/cipher.c 2018-03-22 16:21:14.0 -1000
-+++ new/cipher.c 2018-03-23 10:05:03.886621278 -1000
-@@ -297,7 +297,10 @@ cipher_init(struct sshcipher_ctx **ccp,
+--- old/cipher.c 2018-08-22 22:41:42.0 -0700
new/cipher.c 2018-08-23 21:31:53.327926112 -0700
+@@ -299,7 +299,10 @@ cipher_init(struct sshcipher_ctx **ccp,
goto out;
}
}
@@ -27,7 +27,7 @@
ret = SSH_ERR_LIBCRYPTO_ERROR;
goto out;
}
-@@ -483,7 +486,7 @@ cipher_get_keyiv(struct sshcipher_ctx *c
+@@ -485,7 +488,7 @@ cipher_get_keyiv(struct sshcipher_ctx *c
len, iv))
return SSH_ERR_LIBCRYPTO_ERROR;
} else
@@ -36,7 +36,7 @@
#endif
return 0;
}
-@@ -517,14 +520,19 @@ cipher_set_keyiv(struct sshcipher_ctx *c
+@@ -519,14 +522,19 @@ cipher_set_keyiv(struct sshcipher_ctx *c
EVP_CTRL_GCM_SET_IV_FIXED, -1, (void *)iv))
return SSH_ERR_LIBCRYPTO_ERROR;
} else
@@ -60,8 +60,8 @@
int
diff -aurp old/cipher.h new/cipher.h
old/cipher.h 2018-03-22 16:21:14.0 -1000
-+++ new/cipher.h 2018-03-23 10:05:03.886621278 -1000
+--- old/cipher.h 2018-08-22 22:41:42.0 -0700
new/cipher.h 2018-08-23 21:31:53.327926112 -0700
@@ -46,7 +46,18 @@
#define CIPHER_DECRYPT0
@@ -82,9 +82,9 @@
const struct sshcipher *cipher_by_name(const char *);
const char *cipher_warning_message(const struct sshcipher_ctx *);
diff -aurp
[arch-commits] Commit in openssh/trunk (4 files)
Date: Monday, March 20, 2017 @ 21:48:15
Author: bisson
Revision: 291134
rebuild for openssl-1.1.0
Added:
openssh/trunk/openssl-1.1.0.patch
Modified:
openssh/trunk/PKGBUILD
Deleted:
openssh/trunk/openssh-7.4p1-openssl-1.1.0c.patch
openssh/trunk/pthread-defines.patch
+
PKGBUILD | 11
openssh-7.4p1-openssl-1.1.0c.patch | 2282 ---
openssl-1.1.0.patch| 2217 ++
pthread-defines.patch | 14
4 files changed, 2221 insertions(+), 2303 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-03-20 21:46:08 UTC (rev 291133)
+++ PKGBUILD2017-03-20 21:48:15 UTC (rev 291134)
@@ -5,7 +5,7 @@
pkgname=openssh
pkgver=7.5p1
-pkgrel=1
+pkgrel=2
pkgdesc='Free version of the SSH connectivity tools'
url='https://www.openssh.com/portable.html'
license=('custom:BSD')
@@ -16,8 +16,7 @@
'x11-ssh-askpass: input passphrase in X')
validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
source=("https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
-'openssh-7.4p1-openssl-1.1.0c.patch'
-'pthread-defines.patch'
+'openssl-1.1.0.patch'
'sshdgenkeys.service'
'sshd@.service'
'sshd.service'
@@ -26,8 +25,7 @@
'sshd.pam')
sha256sums=('9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0'
'SKIP'
-'8f76e62ba7a0d0b9a4a328ab1d42cb4bd3c84fd34e5256c8a1e9786c631ce441'
-'241d8b2adbd50b0431da810f24e960442eef9226da55ea3489034590b421835f'
+'b895b5f8e9f7d3a60286bf0a5b313d0b2ae2891ee1358e4862f1a0f1ad0ddc7d'
'4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7'
'69cc2abaaae0aa8071b8eac338b2df725f60ce73381843179b74eaac78ba7f1d'
'c5ed9fa629f8f8dbf3bae4edbad4441c36df535088553fe82695c52d7bde30aa'
@@ -40,8 +38,7 @@
prepare() {
cd $pkgname-$pkgver
# OpenSSL 1.1.0 patch from
http://vega.pgw.jp/~kabe/vsd/patch/openssh-7.4p1-openssl-1.1.0c.patch.html
-# patch -Np0 -i ../openssh-7.4p1-openssl-1.1.0c.patch
-# patch -Np1 -i ../pthread-defines.patch
+ patch -Np1 -i ../openssl-1.1.0.patch
}
build() {
Deleted: openssh-7.4p1-openssl-1.1.0c.patch
===
--- openssh-7.4p1-openssl-1.1.0c.patch 2017-03-20 21:46:08 UTC (rev 291133)
+++ openssh-7.4p1-openssl-1.1.0c.patch 2017-03-20 21:48:15 UTC (rev 291134)
@@ -1,2282 +0,0 @@
-Index: cipher-3des1.c
-===
-RCS file: /home/kabe/cvsroot/openssh/cipher-3des1.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 cipher-3des1.c
cipher-3des1.c 23 Dec 2016 02:49:10 - 1.1.1.2
-+++ cipher-3des1.c 23 Dec 2016 06:54:21 -
-@@ -44,7 +44,7 @@
- */
- struct ssh1_3des_ctx
- {
-- EVP_CIPHER_CTX k1, k2, k3;
-+ EVP_CIPHER_CTX *k1, *k2, *k3;
- };
-
- const EVP_CIPHER * evp_ssh1_3des(void);
-@@ -65,7 +65,7 @@
- if (key == NULL)
- return 1;
- if (enc == -1)
-- enc = ctx->encrypt;
-+ enc = EVP_CIPHER_CTX_encrypting(ctx);
- k1 = k2 = k3 = (u_char *) key;
- k2 += 8;
- if (EVP_CIPHER_CTX_key_length(ctx) >= 16+8) {
-@@ -74,12 +74,17 @@
- else
- k1 += 16;
- }
-- EVP_CIPHER_CTX_init(>k1);
-- EVP_CIPHER_CTX_init(>k2);
-- EVP_CIPHER_CTX_init(>k3);
-- if (EVP_CipherInit(>k1, EVP_des_cbc(), k1, NULL, enc) == 0 ||
-- EVP_CipherInit(>k2, EVP_des_cbc(), k2, NULL, !enc) == 0 ||
-- EVP_CipherInit(>k3, EVP_des_cbc(), k3, NULL, enc) == 0) {
-+ c->k1 = c->k2 = c->k3 = NULL;
-+ c->k1 = EVP_CIPHER_CTX_new();
-+ c->k2 = EVP_CIPHER_CTX_new();
-+ c->k3 = EVP_CIPHER_CTX_new();
-+ if (c->k1 == NULL || c->k2 == NULL || c->k3 == NULL ||
-+ EVP_CipherInit(c->k1, EVP_des_cbc(), k1, NULL, enc) == 0 ||
-+ EVP_CipherInit(c->k2, EVP_des_cbc(), k2, NULL, !enc) == 0 ||
-+ EVP_CipherInit(c->k3, EVP_des_cbc(), k3, NULL, enc) == 0) {
-+ EVP_CIPHER_CTX_free(c->k1);
-+ EVP_CIPHER_CTX_free(c->k2);
-+ EVP_CIPHER_CTX_free(c->k3);
- explicit_bzero(c, sizeof(*c));
- free(c);
- EVP_CIPHER_CTX_set_app_data(ctx, NULL);
-@@ -95,9 +100,9 @@
-
- if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) == NULL)
- return 0;
-- if (EVP_Cipher(>k1, dest, (u_char *)src, len) == 0 ||
-- EVP_Cipher(>k2, dest, dest, len) == 0 ||
-- EVP_Cipher(>k3, dest, dest, len) == 0)
-+ if (EVP_Cipher(c->k1, dest, (u_char *)src, len) == 0 ||
-+ EVP_Cipher(c->k2, dest, dest, len) == 0 ||
-+ EVP_Cipher(c->k3, dest, dest,
