tests: add aes256-gcm encrypted key test

Follow-up to libssh2#1133

Also update `tests/gen_keys.sh` to set `aes256-ctr` encryption method
for `key_ed25519_encrypted' explicitly.

Closes libssh2#1135

Author: vszakats

tests/Makefile.inc

@@ -21,6 +21,7 @@ DOCKER_TESTS = \
   test_auth_pubkey_ok_ed25519_encrypted \
   test_auth_pubkey_ok_ed25519_mem \
   test_auth_pubkey_ok_rsa \
+  test_auth_pubkey_ok_rsa_aes256gcm \
   test_auth_pubkey_ok_rsa_encrypted \
   test_auth_pubkey_ok_rsa_openssh \
   test_auth_pubkey_ok_rsa_signed \
@@ -70,6 +71,8 @@ EXTRA_DIST = \
   key_ed25519_encrypted.pub \
   key_rsa \
   key_rsa.pub \
+  key_rsa_aes256gcm \
+  key_rsa_aes256gcm.pub \
   key_rsa_encrypted \
   key_rsa_encrypted.pub \
   key_rsa_openssh \

tests/gen_keys.sh

@@ -35,6 +35,7 @@ ssh-keygen -t dsa             -N ''          -m PEM -C 'key_dsa_wrong'
 ssh-keygen -t rsa     -b 2048 -N ''          -m PEM -C 'key_rsa'                 -f 'key_rsa'
 ssh-keygen -t rsa     -b 2048 -N "${pw}"     -m PEM -C 'key_rsa_encrypted'       -f 'key_rsa_encrypted'
 ssh-keygen -t rsa     -b 2048 -N ''                 -C 'key_rsa_openssh'         -f 'key_rsa_openssh'
+ssh-keygen -t rsa     -b 2048 -N "${pw}"            -C 'key_rsa_aes256gcm'       -f 'key_rsa_aes256gcm'     -Z [email protected]
 ssh-keygen -t rsa     -b 4096 -N ''                 -C 'key_rsa_signed'          -f 'key_rsa_signed'
 ssh-keygen                    -I "${id}" -n "${pr}" -s 'openssh_server/ca_rsa'      'key_rsa_signed.pub'
 
@@ -43,13 +44,14 @@ ssh-keygen -t ecdsa   -b  384 -N ''                 -C 'key_ecdsa_signed'
 ssh-keygen                    -I "${id}" -n "${pr}" -s 'openssh_server/ca_ecdsa'    'key_ecdsa_signed.pub'
 
 ssh-keygen -t ed25519         -N ''                 -C 'key_ed25519'             -f 'key_ed25519'
-ssh-keygen -t ed25519         -N "${pw}"            -C 'key_ed25519_encrypted'   -f 'key_ed25519_encrypted'
+ssh-keygen -t ed25519         -N "${pw}"            -C 'key_ed25519_encrypted'   -f 'key_ed25519_encrypted' -Z aes256-ctr
 
 cat \
   'key_dsa.pub' \
   'key_rsa.pub' \
   'key_rsa_encrypted.pub' \
   'key_rsa_openssh.pub' \
+  'key_rsa_aes256gcm.pub' \
   'key_ed25519.pub' \
   'key_ed25519_encrypted.pub' \
   'key_ecdsa.pub' \

tests/key_rsa_aes256gcm

@@ -0,0 +1,28 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAAFmFlczI1Ni1nY21Ab3BlbnNzaC5jb20AAAAGYmNyeXB0AA
+AAGAAAABAmOIAmfR0iPtpLznIb9WCyAAAAEAAAAAEAAAEXAAAAB3NzaC1yc2EAAAADAQAB
+AAABAQDD+1l4u2KtpvsP2EpioqgHjfirT7IIQOQfCsjZCppmLUcPE1/qCC7krqjzaQ3nuK
+lVEc/pKJrti2oc0tBDp6zzr8pPkmzdMtpjP84RkJZwu6eVZyZqQrjpmwjw7IWVbGoxkKFp
+WS2ndxCzhoD/F+TW2NcjpwFN53Ktq0SdHVUXU00RlzUiKNTdzanb8vyF3m+PGwIWPX92E2
+t/31WxRVXwybTdpXSzyz9IIjxMkrSRVa8XzX0EyUzETuiAeU94AWJX5Gu/pFJT6E7VEMQu
+deN4iI75WYGxrYU1HCOTnsYk/9LCdM7O6ntJIlzul3CwXsD6+B35hu5AJb91RNbHYWUzAA
+AD0HUCt7WrNYthfkq/kHld0SbsL6Eb6fu3iMWtXrRAi1/9sV5520u3NNjPwdFWSe4rWPGO
+uBUW+zwquU1Ob9JIsgMwBtGSCrx6UOhPEMsJF76HRkkgRow9tLZkFB7YZf6RLUALIg12Sf
+lv0YEAOZZejp2m7866ABYpcju0AsJ9M6p3H8vd5SK2KVyybV0ITKeetUNctCEw/sxQQN6d
+p/pPbDFf5NiC4MPctdjM+PzkXOQ1Aw6kkkmz1TsfN6wyjuCKR1fMzloCc5WVC5LAtMd+sN
+cVJmBKe2tVVHSsN+z0MuU9zb1XLi9cvSl/S2MGQFU1KFr8GTG+WYkS/BUeNUup8oxYKWNZ
+LQYUpqs5dGoLWgxNDTrXnFoT5QaSob9FSANaJdT/bjL7Dtvnmakwd1nR1ZDDENUpWFjUAM
+yEavga1xS2tWhMNqRLzhoszyvAykdYXoKHj7ovWwXA6d6WVrlaP7zLxPScD3ML9qfLp2DY
+IMM7WDFmzPiSyI731dN7xoBroblaGInM8JK8B6gpS+QvLj7UcmNdQldHRgT/2KsK5K2Cn3
+16gHKUG2vnqzASJ6IrqII/H557t0Ded27SB5ZMP2adyMRDwBJNMlCGhJmbYECdzr+1eJU3
+1FQTV7Iz6+XNmEK3QdC5qCrGzem6GPm3j1FpuDYS5Z7AszfVPCeJr031ePcH6JZOMa09A0
+Zfcv2/+lyIpt713m9pTMnbfTEbxa2EVquVnSG+YyknASMnqw/DAT5n3/Zx9sO7RefrrNHx
+MhOG5Pg1TIb1gr0W5R/f+0evqftJTLDvP7z5cbsqBlKpIc5jnWuV/kvDhltN2Ty6FjSRlX
+kdf/Cgig7xKxcgd4iC98ThvcHaGjkAu4vD2G6tCVE/vEhq6rkhTsTS/OwKUC8Wd/Agf02S
+2MRl7cocSqZAJQDiLIWwDIg8hrAV67WqLZi82v4tH+TwjcUnP/JHFI0ZQkcQF203sGml77
+YC2qS/km1AMj4J4E8i6qLWM3gKuo7ZOvigDQfCGY0VLmuPugI0UKBhiVK7yyKdAfO5CM3d
+S6c2dNk7AHXI2AdtoFNe227rutuVV1JFzK9si6ZEo6SrcqigPq7WcKjkzrEIVFXxfnj1c2
+sYQ8gWlzHO3WvSM7/+9vpv0yQEHT1iysjkWscIPEQqkJ7LizXhq8MWp7NRlyIY6/CcqAzX
+mgIHD2WnoZ/4EzR6tgewWdaIoduiGbO3q7E06sw+2VGwFDXYfOIQjFgvm/fJu4BGRB1dbW
+HfPJ4F59jHjnnxse44PkztJ3IydvQ4RvM/zoUPa6RMCZTkYnJ0SsgnRoli5+UNNWbf
+-----END OPENSSH PRIVATE KEY-----

tests/key_rsa_aes256gcm.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDD+1l4u2KtpvsP2EpioqgHjfirT7IIQOQfCsjZCppmLUcPE1/qCC7krqjzaQ3nuKlVEc/pKJrti2oc0tBDp6zzr8pPkmzdMtpjP84RkJZwu6eVZyZqQrjpmwjw7IWVbGoxkKFpWS2ndxCzhoD/F+TW2NcjpwFN53Ktq0SdHVUXU00RlzUiKNTdzanb8vyF3m+PGwIWPX92E2t/31WxRVXwybTdpXSzyz9IIjxMkrSRVa8XzX0EyUzETuiAeU94AWJX5Gu/pFJT6E7VEMQudeN4iI75WYGxrYU1HCOTnsYk/9LCdM7O6ntJIlzul3CwXsD6+B35hu5AJb91RNbHYWUz key_rsa_aes256gcm

tests/openssh_server/authorized_keys

@@ -2,6 +2,7 @@ ssh-dss AAAAB3NzaC1kc3MAAACBAK2Jh2Ck+8W1+LsFrjgOIH7XHySiONPSdG+faFTZprinh9cjyR3o
 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAnak1T7zHJ+hVRFBDQ9pf1KVzmd5gaNc7y7NPmL13aOG3sYeJevi1x1WM/R3tb8XnUnzZUX9GJN0MYovvZsw9bknG1mDP72LFbGp/gzPddGIKHBBpvceDaJ85sM/ME3XOtD7uuXQuNAuEHwEzSMMiSIEMcQS+lXIcMLr5xPLEkyNvqsO5RqSjMTLHKHgY8gLWx7oQ1avokhwuDxF7P3Pqtj+rW2Te6vR0i1H6EyFPsBkzkgNXb33cus8M1CnTmYTSgJgmHO2LLcGpjQ5sL8T/PWIWHaSqTnkrFXEMysgoteXnAYILjzyBaqq2WV4KA3TluGdAP2p8gC32QtKmIuis3Q== awl03@bounty
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC92YlGoc4PJy6DzX916JJZhxkvmkWBLGJdWOL7R9B6iaYEKebBxzTE3P1RcnxnuI06kklVq/KcDP9sLlgawTZcDg7ifM7HncPOi18OON8vvVVzodikHzuupjhpI5YTT9wwV2fDVi2URsBjvX4AFiZ5WM3/NwqdKpYABzWieBikXGJ58Tsnw+zQw2qMmKKESBuzSN538loTAj5iEH/GAKYDbbH9t2a17qhNCNEw4vrtURT9JqwO1cOg7N1OKpmqCPEbK0wuSTljNC230VJ06X/8UqahWWSH6MreGy6gwpPi6i9wFiFLur301R0dTPiKVhz6bguhcC1EAlhSgjfelFJt awl03@bounty
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTe1lN2L/yet0Ma1JzXkQf3t1f+pauALec2FsGZy87KRJW1AOxcTTiePjlFwP1yfSK1lWXQ+uf0b61gkKqqR52FDky24HJWuYlfXlEQMn2d/PNDNVDDbO4TXKyNxxUHFJ6qYMNd4kWjOH+6rmYoWKsWV+3mDRbHagbVPEYL8wep8OTqKOqruVLVPzZyYZkBtn4XOFi6UE8WKiSVdK1Am1O5UxvlD95t32eYch6wQ9azgMqja6spe/L5UJgP83QZFknVC3wPZWkjqomVFql0FpaQclENwyY/OZMxr0cT/f7bCL6s4A/1XpbsGmC0xak4/THHbOn+0LdIej2nGV8JFoR
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDD+1l4u2KtpvsP2EpioqgHjfirT7IIQOQfCsjZCppmLUcPE1/qCC7krqjzaQ3nuKlVEc/pKJrti2oc0tBDp6zzr8pPkmzdMtpjP84RkJZwu6eVZyZqQrjpmwjw7IWVbGoxkKFpWS2ndxCzhoD/F+TW2NcjpwFN53Ktq0SdHVUXU00RlzUiKNTdzanb8vyF3m+PGwIWPX92E2t/31WxRVXwybTdpXSzyz9IIjxMkrSRVa8XzX0EyUzETuiAeU94AWJX5Gu/pFJT6E7VEMQudeN4iI75WYGxrYU1HCOTnsYk/9LCdM7O6ntJIlzul3CwXsD6+B35hu5AJb91RNbHYWUz key_rsa_aes256gcm
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFEg0II3zbc1yWGhRzIc5KwTRlmx10RQP0sS63+1oMPi
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICHxEyUTOVHXvdMFARedFQ+H9DW/n8Zy3daKKRqnTDMq
 ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBOiyJJwf+hFJrOkik9IQVxjhhVnI1vKl4BGLj03erLvw4TXXwoZzlPx6J936fU9JvvPw+d8PA4viMEfFbmdbHREKhwi3u1vZrfj0mB8SXw96AcZwX8PAL556wgom+/Qx+Q==

tests/test_auth_pubkey_ok_rsa_aes256gcm.c

@@ -0,0 +1,22 @@
+/* Copyright (C) The libssh2 project and its contributors.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "runner.h"
+
+int test(LIBSSH2_SESSION *session)
+{
+#if LIBSSH2_RSA_SHA1 && LIBSSH2_AES_GCM && \
+    (defined(LIBSSH2_OPENSSL) || defined(LIBSSH2_WOLFSSL))
+    /* set in Dockerfile */
+    return test_auth_pubkey(session, 0,
+                            "libssh2",
+                            "libssh2",
+                            "key_rsa_aes256gcm.pub",
+                            "key_rsa_aes256gcm");
+#else
+    (void)session;
+    return 0;
+#endif
+}