djm@openbsd.org
f3ebaffd87
upstream: fix all-zero check in kexc25519_shared_key
...
from markus@ ok djm@
OpenBSD-Commit-ID: 60b1d364e0d9d34d1d1ef1620cb92e36cf06712d
2019-01-21 21:46:05 +11:00
jmc@openbsd.org
9d1a9771d0
upstream: - -T was added to the first synopsis by mistake - since
...
"..." denotes optional, no need to surround it in []
ok djm
OpenBSD-Commit-ID: 918f6d8eed4e0d8d9ef5eadae1b8983d796f0e25
2019-01-21 21:46:05 +11:00
Darren Tucker
2f0bad2bf8
Make --with-rpath take a flag instead of yes/no.
...
Linkers need various flags for -rpath and similar, so make --with-rpath
take an optional flag argument which is passed to the linker. ok djm@
2019-01-21 21:28:27 +11:00
Damien Miller
23490a6c97
fix previous test
2019-01-21 15:05:43 +11:00
Darren Tucker
b6dd3277f2
Wrap ECC static globals in EC_KEY_METHOD_NEW too.
2019-01-21 13:50:17 +11:00
Damien Miller
b2eb9db35b
pass TEST_SSH_SSHPKCS11HELPER to regress tests
2019-01-21 13:09:23 +11:00
Damien Miller
ba58a529f4
make agent-pkcs11 search harder for softhsm2.so
2019-01-21 13:09:23 +11:00
djm@openbsd.org
662be40c62
upstream: always print the caller's error message in ossl_error(),
...
even when there are no libcrypto errors to report.
OpenBSD-Commit-ID: 09ebaa8f706e0eccedd209775baa1eee2ada806a
2019-01-21 13:07:04 +11:00
djm@openbsd.org
ce46c3a077
upstream: get the ex_data (pkcs11_key object) back from the keys at
...
the index at which it was inserted, rather than assuming index 0
OpenBSD-Commit-ID: 1f3a6ce0346c8014e895e50423bef16401510aa8
2019-01-21 13:06:58 +11:00
djm@openbsd.org
0a5f2ea356
upstream: GSSAPI code got missed when converting to new packet API
...
OpenBSD-Commit-ID: 37e4f06ab4a0f4214430ff462ba91acba28b7851
2019-01-21 12:05:49 +11:00
Damien Miller
2efcf812b4
Fix -Wunused when compiling PKCS#11 without ECDSA
2019-01-21 11:57:21 +11:00
djm@openbsd.org
3c0c657ed7
upstream: allow override of ssh-pkcs11-helper binary via
...
$TEST_SSH_SSHPKCS11HELPER from markus@
OpenBSD-Regress-ID: 7382a3d76746f5a792d106912a5819fd5e49e469
2019-01-21 11:51:54 +11:00
djm@openbsd.org
760ae37b45
upstream: adapt agent-pkcs11.sh test to softhsm2 and add support
...
for ECDSA keys
work by markus@, ok djm@
OpenBSD-Regress-ID: 1ebc2be0e88eff1b6d8be2f9c00cdc60723509fe
2019-01-21 11:51:54 +11:00
djm@openbsd.org
b2ce8b31a1
upstream: add "extra:" target to run some extra tests that are not
...
enabled by default (currently includes agent-pkcs11.sh); from markus@
OpenBSD-Regress-ID: 9a969e1adcd117fea174d368dcb9c61eb50a2a3c
2019-01-21 11:51:54 +11:00
djm@openbsd.org
632976418d
upstream: use ECDSA_SIG_set0() instead of poking signature values into
...
structure directly; the latter works on LibreSSL but not on OpenSSL. From
portable.
OpenBSD-Commit-ID: 5b22a1919d9cee907d3f8a029167f70a481891c6
2019-01-21 11:48:45 +11:00
Damien Miller
5de6ac2bad
remove HAVE_DLOPEN that snuck in
...
portable doesn't use this
2019-01-21 11:45:16 +11:00
Damien Miller
e2cb445d78
conditionalise ECDSA PKCS#11 support
...
Require EC_KEY_METHOD support in libcrypto, evidenced by presence
of EC_KEY_METHOD_new() function.
2019-01-21 11:32:28 +11:00
djm@openbsd.org
fcb1b09371
upstream: we use singleton pkcs#11 RSA_METHOD and EC_KEY_METHOD
...
now, so there is no need to keep a copy of each in the pkcs11_key object.
work by markus@, ok djm@
OpenBSD-Commit-ID: 43b4856516e45c0595f17a8e95b2daee05f12faa
2019-01-21 10:57:03 +11:00
djm@openbsd.org
6529409e85
upstream: KNF previous; from markus@
...
OpenBSD-Commit-ID: 3dfe35e25b310c3968b1e4e53a0cb1d03bda5395
2019-01-21 10:57:03 +11:00
djm@openbsd.org
58622a8c82
upstream: use OpenSSL's RSA reference counting hooks to
...
implicitly clean up pkcs11_key objects when their owning RSA object's
reference count drops to zero. Simplifies the cleanup path and makes it more
like ECDSA's
work by markus@, ok djm@
OpenBSD-Commit-ID: 74b9c98f405cd78f7148e9e4a4982336cd3df25c
2019-01-21 10:57:03 +11:00
djm@openbsd.org
f118542fc8
upstream: make the PKCS#11 RSA code more like the new PKCS#11
...
ECDSA code: use a single custom RSA_METHOD instead of a method per key
suggested by me, but markus@ did all the work.
ok djm@
OpenBSD-Commit-ID: 8aafcebe923dc742fc5537a995cee549d07e4b2e
2019-01-21 10:54:37 +11:00
djm@openbsd.org
445cfce49d
upstream: fix leak of ECDSA pkcs11_key objects
...
work by markus, ok djm@
OpenBSD-Commit-ID: 9fc0c4f1d640aaa5f19b8d70f37ea19b8ad284a1
2019-01-21 10:54:37 +11:00
djm@openbsd.org
8a2467583f
upstream: use EVP_PKEY_get0_EC_KEY() instead of direct access of
...
EC_KEY internals as that won't work on OpenSSL
work by markus@, feedback and ok djm@
OpenBSD-Commit-ID: 4a99cdb89fbd6f5155ef8c521c99dc66e2612700
2019-01-21 10:54:37 +11:00
djm@openbsd.org
24757c1ae3
upstream: cleanup PKCS#11 ECDSA pubkey loading: the returned
...
object should never have a DER header
work by markus; feedback and ok djm@
OpenBSD-Commit-ID: b617fa585eddbbf0b1245b58b7a3c4b8d613db17
2019-01-21 10:54:37 +11:00
djm@openbsd.org
749aef3032
upstream: cleanup unnecessary code in ECDSA pkcs#11 signature
...
work by markus@, feedback and ok djm@
OpenBSD-Commit-ID: affa5ca7d58d59fbd16169f77771dcdbd2b0306d
2019-01-21 10:54:37 +11:00
djm@openbsd.org
0c50992af4
upstream: cleanup pkcs#11 client code: use sshkey_new in instead
...
of stack- allocating a sshkey
work by markus@, ok djm@
OpenBSD-Commit-ID: a048eb6ec8aa7fa97330af927022c0da77521f91
2019-01-21 10:54:37 +11:00
djm@openbsd.org
854bd8674e
upstream: allow override of the pkcs#11 helper binary via
...
$SSH_PKCS11_HELPER; needed for regress tests.
work by markus@, ok me
OpenBSD-Commit-ID: f78d8185500bd7c37aeaf7bd27336db62f0f7a83
2019-01-21 10:54:37 +11:00
djm@openbsd.org
93f02107f4
upstream: add support for ECDSA keys in PKCS#11 tokens
...
Work by markus@ and Pedro Martelletto, feedback and ok me@
OpenBSD-Commit-ID: a37d651e221341376636056512bddfc16efb4424
2019-01-21 10:54:37 +11:00
djm@openbsd.org
aa22c20e0c
upstream: add option to test whether keys in an agent are usable,
...
by performing a signature and a verification using each key "ssh-add -T
pubkey [...]"
work by markus@, ok djm@
OpenBSD-Commit-ID: 931b888a600b6a883f65375bd5f73a4776c6d19b
2019-01-21 10:46:04 +11:00
tb@openbsd.org
a36b0b14a1
upstream: Fix BN_is_prime_* calls in SSH, the API returns -1 on
...
error.
Found thanks to BoringSSL's commit 53409ee3d7595ed37da472bc73b010cd2c8a5ffd
by David Benjamin.
ok djm, dtucker
OpenBSD-Commit-ID: 1ee832be3c44b1337f76b8562ec6d203f3b072f8
2019-01-21 10:46:04 +11:00
dtucker@openbsd.org
ec4776bb01
upstream: DH-GEX min value is now specified in RFC8270. ok djm@
...
OpenBSD-Commit-ID: 1229d0feb1d0ecefe05bf67a17578b263e991acc
2019-01-21 10:46:03 +11:00
Darren Tucker
c90a7928c4
Check for cc before gcc.
...
If cc is something other than gcc and is the system compiler prefer using
that, unless otherwise told via $CC. ok djm@
2019-01-21 09:22:36 +11:00
Damien Miller
9b655dc9c9
last bits of old packet API / active_state global
2019-01-20 14:55:27 +11:00
Damien Miller
3f0786bbe7
remove PAM dependencies on old packet API
...
Requires some caching of values, because the PAM code isn't
always called with packet context.
2019-01-20 10:22:18 +11:00
Damien Miller
08f66d9f17
remove vestiges of old packet API from loginrec.c
2019-01-20 09:58:45 +11:00
Damien Miller
c327813ea1
depend
2019-01-20 09:45:38 +11:00
djm@openbsd.org
135e302cfd
upstream: fix error in refactor: use ssh_packet_disconnect() instead of
...
sshpkt_error(). The first one logs the error and exits (what we want) instead
of just logging and blundering on.
OpenBSD-Commit-ID: 39f51b43641dce9ce0f408ea6c0e6e077e2e91ae
2019-01-20 09:45:18 +11:00
djm@openbsd.org
245c6a0b22
upstream: remove last traces of old packet API!
...
with & ok markus@
OpenBSD-Commit-ID: 9bd10437026423eb8245636ad34797a20fbafd7d
2019-01-20 09:45:18 +11:00
djm@openbsd.org
04c091fc19
upstream: remove last references to active_state
...
with & ok markus@
OpenBSD-Commit-ID: 78619a50ea7e4ca2f3b54d4658b3227277490ba2
2019-01-20 09:45:18 +11:00
djm@openbsd.org
ec00f918b8
upstream: convert monitor.c to new packet API
...
with & ok markus@
OpenBSD-Commit-ID: 61ecd154bd9804461a0cf5f495a29d919e0014d5
2019-01-20 09:45:18 +11:00
djm@openbsd.org
6350e03169
upstream: convert sshd.c to new packet API
...
with & ok markus@
OpenBSD-Commit-ID: ea569d3eaf9b5cf1bad52779fbfa5fa0b28af891
2019-01-20 09:45:18 +11:00
djm@openbsd.org
a5e2ad88ac
upstream: convert session.c to new packet API
...
with & ok markus@
OpenBSD-Commit-ID: fae817207e23099ddd248960c984f7b7f26ea68e
2019-01-20 09:45:18 +11:00
djm@openbsd.org
3a00a92159
upstream: convert auth.c to new packet API
...
with & ok markus@
OpenBSD-Commit-ID: 7e10359f614ff522b52a3f05eec576257794e8e4
2019-01-20 09:45:17 +11:00
djm@openbsd.org
7ec5cb4d15
upstream: convert serverloop.c to new packet API
...
with & ok markus@
OpenBSD-Commit-ID: c92dd19b55457541478f95c0d6b318426d86d885
2019-01-20 09:45:17 +11:00
djm@openbsd.org
64c9598ac0
upstream: convert the remainder of sshconnect2.c to new packet
...
API
with & ok markus@
OpenBSD-Commit-ID: 0986d324f2ceb5e8a12ac21c1bb10b3b4b1e0f71
2019-01-20 09:45:17 +11:00
djm@openbsd.org
bc5e1169d1
upstream: convert the remainder of clientloop.c to new packet API
...
with & ok markus@
OpenBSD-Commit-ID: ce2fbbacb86a290f31da1e7bf04cddf2bdae3d1e
2019-01-20 09:45:17 +11:00
Damien Miller
5ebce136a6
upstream: convert auth2.c to new packet API
...
OpenBSD-Commit-ID: ed831bb95ad228c6791bc18b60ce7a2edef2c999
2019-01-20 09:44:53 +11:00
djm@openbsd.org
172a592a53
upstream: convert servconf.c to new packet API
...
with & ok markus@
OpenBSD-Commit-ID: 126553aecca302c9e02fd77e333b9cb217e623b4
2019-01-20 09:02:44 +11:00
djm@openbsd.org
8cc7a679d2
upstream: convert channels.c to new packet API
...
with & ok markus@
OpenBSD-Commit-ID: 0b8279b56113cbd4011fc91315c0796b63dc862c
2019-01-20 09:02:37 +11:00
djm@openbsd.org
06232038c7
upstream: convert sshconnect.c to new packet API
...
with & ok markus@
OpenBSD-Commit-ID: 222337cf6c96c347f1022d976fac74b4257c061f
2019-01-20 09:02:36 +11:00