aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2019-04-18 11:07:13 +0200
committerHans Nilsson <[email protected]>2019-04-18 11:07:13 +0200
commitc6c59b4cdadeeba5edcb88e86c32418226775dc2 (patch)
tree498965d56daee114113d649e28093a801ecf550e /lib
parent236cb4b5eb3b89c837324a5ae7a11117d671d717 (diff)
parentc500d66b68ff0fe174128926318f3eead4dcbb15 (diff)
parentc0e8fec9d90b2a4cbf358ba1230b2f0ba53ce6e7 (diff)
parentf16b3782207c23eb02aaa52460b889be0546a5f3 (diff)
parentce9da69e350e8227927e4e5203932fa031006a5d (diff)
downloadotp-c6c59b4cdadeeba5edcb88e86c32418226775dc2.tar.gz
otp-c6c59b4cdadeeba5edcb88e86c32418226775dc2.tar.bz2
otp-c6c59b4cdadeeba5edcb88e86c32418226775dc2.zip
Merge branches 'hans/crypto/new_supports_1/OTP-15771', 'hans/ssh/new_supports', 'hans/crypto/remove_warnings' and 'hans/ssh/remove_warnings'
* hans/crypto/new_supports_1/OTP-15771: crypto: New function supports/1 * hans/ssh/new_supports: ssh: Use new api for aead ciphers ssh: Use correct names of ciphers * hans/crypto/remove_warnings: ssh: Fix deprecation warnings in tests crypto: Remove unused var warning in tests * hans/ssh/remove_warnings: ssh: Fix deprecation warnings in tests ssh: Remove unused function warning in tests ssh: Remove unused var warning in tests ssh: Remove unused var warning