Andreas Schneider
bfbd574098
gitlab-ci: Add missing debian variable
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-07-02 09:06:42 +02:00
Andreas Schneider
b4462bdea0
tests: Use assert_ssh_return_code() in torture_algorithms
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-07-02 08:03:20 +02:00
Andreas Schneider
6b8d1aa836
gitlab-ci: Fix path to toolchain file
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 15:41:50 +02:00
Andreas Schneider
d90b88588f
gitlab-ci: Add 32bit build on openSUSE
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 15:39:27 +02:00
Andreas Schneider
6a715b80d6
cmake: Unset CMAKE_REQUIRED_* variables
...
This should fix the 'gcc -m32' build!
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 15:27:09 +02:00
Andreas Schneider
084769b88c
libcrypto: Fix size printing
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 15:27:09 +02:00
Andreas Schneider
f4408f38a3
torture: Give sshd at least 100ms to start.
...
This should avoid some 'No route to host' errors.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 15:27:09 +02:00
Andreas Schneider
6dd9303729
chachapoly: Use a function instead of an extern variable
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 14:37:04 +02:00
Andreas Schneider
a19513b87a
example: Add missing error checks in ssh_server_fork
...
CID 1393676
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 14:37:04 +02:00
Andreas Schneider
21962dd154
known_hosts: Simplify invalid tokens check
...
CID 1393677
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 14:37:04 +02:00
Andreas Schneider
8917b84840
examples: Make gobal variables static in scp_download
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 14:37:04 +02:00
Andreas Schneider
4b0fd10a99
examples: Define LIMIT as unsinged long
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 14:37:04 +02:00
Andreas Schneider
3350fd7479
chachapoly: Make global variables static
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 14:37:04 +02:00
Andreas Schneider
c98b00a5f4
log: Make global variables static
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 14:37:04 +02:00
Andreas Schneider
88673b2d1f
channels: Fix NULL check in channel_rcv_data callback
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 14:37:04 +02:00
Andreas Schneider
f425ebb098
tests: Use new assert ssh return code macros in torture_connect
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 14:37:04 +02:00
Andreas Schneider
f6284eafd6
torture: Add assert macros for ssh return codes
...
This allows us to print errors from ssh sessions.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 14:37:04 +02:00
Andreas Schneider
cf250171de
include: Add arpa/inet.h for htonl
...
This should fix a build warning on FreeBSD.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 14:37:04 +02:00
Andreas Schneider
a82e24f024
config: Initialize glob_t with C99 initializer
...
Should fix a build warning on FreeBSD.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-30 14:37:04 +02:00
Andreas Schneider
60450ef936
gitlab-ci: Fix stage
2018-06-29 17:26:34 +02:00
Andreas Schneider
d11d764c9d
gitlab-ci: Fix path for artifacts
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 16:55:40 +02:00
Nikos Mavrogiannopoulos
ac5c90d771
gitlab-ci: Add build for mips platform
...
This tests multiple items, (1) cross compilation, (2) compilation
on debian and (3) CI run on MIPS systems, tested under qemu. This target
was originally written for GnuTLS by Michael Weiser.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
2018-06-29 16:53:33 +02:00
Andreas Schneider
14045f516e
doc: Document server testing
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 16:22:59 +02:00
Tilo Eckert
3e70f06fc8
doc: add documentation about building with client tests
...
Signed-off-by: Tilo Eckert <tilo.eckert@flam.de>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 15:59:08 +02:00
Tilo Eckert
a2a6dddacf
tests: adjust test for kex string "curve25519"
...
Signed-off-by: Tilo Eckert <tilo.eckert@flam.de>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 15:57:57 +02:00
Tilo Eckert
a366bb3b45
tests: add pkd tests for kex curve25519
...
Signed-off-by: Tilo Eckert <tilo.eckert@flam.de>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 15:57:51 +02:00
Tilo Eckert
a4a6017e6e
tests: add algorithm tests for kex curve25519
...
Signed-off-by: Tilo Eckert <tilo.eckert@flam.de>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 15:57:45 +02:00
Tilo Eckert
e60cb2ee10
kex: add curve25519-sha256 as alias for curve25519-sha256@libssh.org
...
see: https://tools.ietf.org/id/draft-ietf-curdle-ssh-curves-07.html
Signed-off-by: Tilo Eckert <tilo.eckert@flam.de>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 15:57:11 +02:00
Aris Adamantiadis
da0f360478
kex: log negotiated methods
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 15:55:37 +02:00
Andreas Schneider
206f3ff895
Rest in Peace SSHv1
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
2018-06-29 14:41:14 +02:00
Andreas Schneider
81b4320318
gitlab: Fix build on FreeBSD
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 11:45:14 +02:00
Andreas Schneider
bed60f9b84
kex: Enable chacha20-poly1304 KEX with mbedtls
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 11:41:22 +02:00
Andreas Schneider
10728f8577
cmake: Disable torture_packet on Windows
...
The test uses socketpair().
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 10:57:36 +02:00
Andreas Schneider
72141cae0b
gitlab: Disable client testing on freebsd
...
The host doesn't have cwrap installed.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 10:54:35 +02:00
Andreas Schneider
ec842c3ca3
gitlab: Remove the debian aarch64 build
...
This doesn't work anymore
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 10:52:46 +02:00
Andreas Schneider
054d2dffc1
gitlab: Add SERVER_TESTING and updates for cmake
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 10:49:52 +02:00
Andreas Schneider
d971983d5e
cmake: Add SERVER_TESTING option
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 10:49:14 +02:00
Andreas Schneider
946f8f64ef
cmake: Rename WITH_CLIENT_TESTING option to CLIENT_TESTING
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 10:32:07 +02:00
Andreas Schneider
84ac7d1de0
cmake: Rename WITH_TESTING option to UNIT_TESTING
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 10:31:53 +02:00
Andreas Schneider
f4ddf9df53
tests: Fix key parsing in torture_pki_dsa_publickey_base64
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 10:05:06 +02:00
Andreas Schneider
d7477dc745
tests: Remove system includes from torture_packet
...
This fixes the build on Windows. Those come in via the include of
socket.c anyway.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 09:35:54 +02:00
Andreas Schneider
1444ae5add
pki: Fix random memory corruption
...
Fixes T78
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 09:30:59 +02:00
Andreas Schneider
aa95eb1965
tests: Move CHACHA20 define out of HAVE_DSA ifdef
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 09:08:07 +02:00
Andreas Schneider
649a7490a6
gitlab: Do not build with SSHv1 support
...
This will be removed soon.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-28 18:00:47 +02:00
Jon Simons
c089b700c6
chacha: fix build for mbedTLS
...
Fix the build for mbedTLS:
* set HAVE_CHACHA for non-mbedTLS builds
* only compile chachapoly.c when HAVE_CHACHA
* use empty CHACHA20 in src/kex.c unless HAVE_CHACHA
Signed-off-by: Jon Simons <jon@jonsimons.org>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-28 09:06:30 +02:00
Jon Simons
c8d6445d44
packet_crypt: remove set_decrypt_key
upon ssh_packet_decrypt_len
...
In 06b9901e64
, invocations of `set_decrypt_key`
and `set_encrypt_key` were moved into the `ssh_packet_newkeys` callback, away
from the packet decrypt and encrypt functions.
Remove the extra `set_decrypt_key` for the case that an `aead_decrypt_length`
is not NULL. At this time, only the chacha20-poly1305@openssh.com cipher
is affected by this change.
Signed-off-by: Jon Simons <jon@jonsimons.org>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-28 09:06:30 +02:00
Jon Simons
d4a4ce4d44
chacha: use a cipher cleanup callback
...
With this change there is less code specific to the
chacha20-poly1305 cipher found in src/wrapper.c.
Signed-off-by: Jon Simons <jon@jonsimons.org>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-28 09:06:30 +02:00
Jon Simons
7a2624dee4
packet_crypt: fix unused variable compiler warning
...
The local `rc` variable here is never set. Fix a warning that is
emitted due to `-Wunused-variable`.
Signed-off-by: Jon Simons <jon@jonsimons.org>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-28 09:06:30 +02:00
Jon Simons
f827833d82
tests: fix torture_packet.c test_data
...
Make the `test_data` larger so that tests do not read beyond
its length. Observed in testing with an `-fsanitize=address`
build locally.
Signed-off-by: Jon Simons <jon@jonsimons.org>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-28 09:06:30 +02:00
Jon Simons
6f38e0b771
pkd: move chacha20-poly1305@openssh.com tests to OPENSSHONLY section
...
Dropbear does not currently implement the 'chacha20-poly1305@openssh.com'
cipher, so move it into the OPENSSHONLY suite.
Signed-off-by: Jon Simons <jon@jonsimons.org>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-28 09:06:30 +02:00