Tess Gauthier 0db6f3e486 resolve merge conflicts

2023-08-21 16:35:13 -04:00

..

authopt

Merge 9.2 (#657)

2023-02-09 16:57:36 -05:00

bitmap

upstream: sys/param.h cleanup, mostly using MINIMUM() and

2021-12-20 12:16:49 +11:00

conversion

upstream: sys/param.h cleanup, mostly using MINIMUM() and

2021-12-20 12:16:49 +11:00

hostkeys

Merge 9.2 (#657)

2023-02-09 16:57:36 -05:00

kex

Add header changes missed in previous.

2023-03-07 18:34:41 +11:00

match

upstream: sys/param.h cleanup, mostly using MINIMUM() and

2021-12-20 12:16:49 +11:00

misc

wrap poll.h include in HAVE_POLL_H

2023-08-10 09:08:49 +10:00

sshbuf

Wrap OpenSSL includes in unit tests in ifdef.

2022-01-14 13:47:27 +11:00

sshkey

resolve merge conflicts

2023-08-21 16:35:13 -04:00

sshsig

another ERR_load_CRYPTO_strings() vestige

2023-03-24 15:39:47 +11:00

test_helper

resolve merge conflicts

2023-08-21 16:35:13 -04:00

utf8

make unittests pass for no-openssl case

2019-09-08 10:37:17 +10:00

win32compat

add codeql fixes/suppressions (#664)

2023-02-13 11:39:59 -05:00

Makefile

upstream: run sshsig unit tests

2020-06-19 16:06:06 +10:00

Makefile.inc

upstream: unbreak tests for recent security key changes

2019-11-25 21:34:20 +11:00