userauth: enable ssh-rsa-cert-v01@openssh.com for all backends in userauth_supported_key_sign_algs(), fix tests

The PR implementing this did not add anything OpenSSL-specific, yet it gated the feature OpenSSL only. Turns out the reason for this is that the test RSA keys are in OpenSSH format, which is only supported by OpenSSL (and wolfSSL) in libssh2. Fix by converting the two test keys to PEM format, making them compatible with all backends. (RSA OpenSSH key format is already tested separately.) Also: this also fixes outdated comment fields present in these keys. Bug: https://github.com/libssh2/libssh2/pull/1314#discussion_r3542830756 Ref: #2252 (initial fix attempt) Follow-up to 1410efad7a #2249 Follow-up to 3a6ab70dcf #1314 Closes #2483
2026-10-24 03:48:58 +03:00 · 2026-08-02 16:19:39 +02:00
parent 9a959ada91
commit 88dd2f0fb6
6 changed files with 110 additions and 109 deletions
--- a/src/userauth.c
+++ b/src/userauth.c
@@ -1196,11 +1196,8 @@ static int userauth_is_version_less_than_78(const char *version)
 static const char *userauth_supported_key_sign_algs(const char *method)
 {
 #if LIBSSH2_RSA_SHA2
-    if((!strcmp(method, "ssh-rsa"))
-#if defined(LIBSSH2_OPENSSL) || defined(LIBSSH2_WOLFSSL)
-       || !strcmp(method, "ssh-rsa-cert-v01@openssh.com")
-#endif
-      ) {
+    if(!strcmp(method, "ssh-rsa") ||
+       !strcmp(method, "ssh-rsa-cert-v01@openssh.com")) {
        return "rsa-sha2-512,rsa-sha2-256"
 #if LIBSSH2_RSA_SHA1
            ",ssh-rsa"
--- a/tests/keys-generate.sh
+++ b/tests/keys-generate.sh
@@ -37,9 +37,11 @@ ssh-keygen -t rsa     -b 2048 -N ''          -m PEM     -C 'id_rsa'
 ssh-keygen -t rsa     -b 2048 -N "${pw}"     -m PEM     -C 'id_rsa_encrypted'        -f 'keys/id_rsa_encrypted'
 ssh-keygen -t rsa     -b 2048 -N ''          -m RFC4716 -C ''                        -f 'keys/id_rsa_openssh'       # empty comment
 ssh-keygen -t rsa     -b 2048 -N "${pw}"     -m RFC4716 -C 'id_rsa_aes256gcm'        -f 'keys/id_rsa_aes256gcm'     -Z aes256-gcm@openssh.com
-ssh-keygen -t rsa     -b 4096 -N ''          -m RFC4716 -C 'id_rsa_signed'           -f 'keys/id_rsa_signed'
+
+ssh-keygen -t rsa     -b 4096 -N ''          -m PEM     -C 'id_rsa_signed'           -f 'keys/id_rsa_signed'
 ssh-keygen -t ssh-rsa         -I "${id}" -n "${pr}"     -s 'openssh_server/ca_rsa'      'keys/id_rsa_signed.pub'
-ssh-keygen -t rsa     -b 4096 -N ''          -m RFC4716 -C 'id_rsa_sha2_512_signed'  -f 'keys/id_rsa_sha2_512_signed'
+
+ssh-keygen -t rsa     -b 4096 -N ''          -m PEM     -C 'id_rsa_sha2_512_signed'  -f 'keys/id_rsa_sha2_512_signed'
 ssh-keygen -t rsa-sha2-512    -I "${id}" -n "${pr}"     -s 'openssh_server/ca_rsa'      'keys/id_rsa_sha2_512_signed.pub'

 ssh-keygen -t ecdsa   -b  384 -N ''          -m RFC4716 -C ''                        -f 'keys/id_ecdsa'             # empty comment
--- a/tests/keys/id_rsa_sha2_512_signed
+++ b/tests/keys/id_rsa_sha2_512_signed
@@ -1,49 +1,51 @@
-----BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAACFwAAAAdzc2gtcn
-NhAAAAAwEAAQAAAgEAqdL8Y1g4R4k9rtI+xKK/oi46nxr8dLRjbv/1Slv7Cyj50YkfgLXu
-GnQT0g8a0OrRJK8EBJ+PBZ1JJ6FzA7pvO10SuYbuG+7pIsyPT1x5P3YeCe9FgFVQd7E7pE
-isu/1dOhHcA7DLRtNpdtGlXQXA3hlZDFk+Dl/2ioSqMZY5uDlLMevyTFR0nEAOwT3Vbgvk
-ZzeuEUDCiwBzzcyKcEesHTvpUU2Wo8/Z3pHJXZvmBe22nO2jVGMBIpTK4hWIC776+0FeVt
-nYmQ1Uc5NhvumrwmHwgqOPT9uDSb/Omm/ktRrL0JBbE32k1iysaQHOQOo7kU7by0wcu5KP
-167UVsySZ4XKUjImEpsmDKh6+qA0eG5x7Nq/J8KFFA33c/YYJ40dnJQZJA447vDFZHFpQ+
-GrWQqthHRwjD2x7KGkZFayeL8GDo7lLc8BscC81pYgVmUwEuAyNZqCV/qQpg7IcZyIodU2
-ZfsHFDyYCxyKIO3Km+4NxhtwFwq29HpbQCOQ+4bm7kWOg4p1A9ZqAMoz9+UIysFVT5StCG
-xe+XwjXyMG06K2GbioeBXdG1vA2NvxL9aB+PJ9Xyb2MyOnMsE1pfem80EWEd5ALtcMGMot
-g6clvKk3D03HzZcO3UUsCIBkm8zoPV2Iwp6LDemrJspfSTFV2wtO/j5FrZedZERQ3HUWOO
-sAAAdQTXOf4k1zn+IAAAAHc3NoLXJzYQAAAgEAqdL8Y1g4R4k9rtI+xKK/oi46nxr8dLRj
-bv/1Slv7Cyj50YkfgLXuGnQT0g8a0OrRJK8EBJ+PBZ1JJ6FzA7pvO10SuYbuG+7pIsyPT1
-x5P3YeCe9FgFVQd7E7pEisu/1dOhHcA7DLRtNpdtGlXQXA3hlZDFk+Dl/2ioSqMZY5uDlL
-MevyTFR0nEAOwT3VbgvkZzeuEUDCiwBzzcyKcEesHTvpUU2Wo8/Z3pHJXZvmBe22nO2jVG
-MBIpTK4hWIC776+0FeVtnYmQ1Uc5NhvumrwmHwgqOPT9uDSb/Omm/ktRrL0JBbE32k1iys
-aQHOQOo7kU7by0wcu5KP167UVsySZ4XKUjImEpsmDKh6+qA0eG5x7Nq/J8KFFA33c/YYJ4
-0dnJQZJA447vDFZHFpQ+GrWQqthHRwjD2x7KGkZFayeL8GDo7lLc8BscC81pYgVmUwEuAy
-NZqCV/qQpg7IcZyIodU2ZfsHFDyYCxyKIO3Km+4NxhtwFwq29HpbQCOQ+4bm7kWOg4p1A9
-ZqAMoz9+UIysFVT5StCGxe+XwjXyMG06K2GbioeBXdG1vA2NvxL9aB+PJ9Xyb2MyOnMsE1
-pfem80EWEd5ALtcMGMotg6clvKk3D03HzZcO3UUsCIBkm8zoPV2Iwp6LDemrJspfSTFV2w
-tO/j5FrZedZERQ3HUWOOsAAAADAQABAAACAB35JiCmnnBJ0cA8TWXJT8dhH2mbirlSaUZb
-GMECEQH8PnN0H0JJWfgDSshFcDc1aqpt1Wi3fLfB9fpvrWwYCK/Sko56OSZm+XDx581bBe
-9kepLIT10CMcyeVGd/iDU51617H3jrSEV85N1azTPo4wyQLr5WNfS1jT8PgTZ1TESuoA30
-lfRQ56/4QmJq9nOQ18Q7+JYE9xEviEDne/urOr6CJ4D5D8Bj3BFDa+YAsQ2U0ilKbAxl2P
-pwhop2wGdKUuPruqnbkzYYOzKW7aaTeYQ6Ywe7tHykwrxOhTmOzDAGxbhO8jQzdddzVQ7H
-ic69SLwxzetIyL12dbrcmY+kVaZ0RYQBEC4Z7dVqOHtG5sUDGm3qWDp4cICeAs7m3fpQWg
-NgvgEyel1Skzq2L9bk2llLhbDqav5TvV4UlxPlPgQJ+z6Ss/tj9NH6+4M7Mp4pcZ50vWCH
-hGuQrHQGW1LrU8DWOi/ev5FERIglQ6wAmTFWMLaIJq0DSXDIDKV3O19JEpoW1BQQ+GEa1o
-Elxicsypqt1ARpATmmOq5vugcWUGjSoxE1HplYAgMKLtZXdAACDn4OC7L1yMhEMs7nKV+X
-xA+VrPDYObJ90Qfugmh4W05BAeDQw5DOf7vaunx4Z94Kxe0F+9uj9BmKA2ZIZSvNCdXwkw
-zhpM065S3M3Tv9DytxAAABAQC2HmvaPVVSlVRwkmmD5fl3pj/7DXW0+jQvuRxbu+XdSqWz
-sqoNH1Rz3tEUP+FqQW/3JFlelPS4lS+/dEh6IOR0wP6jTM0Lk7t0HgpW4snvfd0PShdkr5
-Qsi6yb0zT27ZKvtkMB+Rpnb7cw0TUrKT0iSgewoBigcrqaRIHblD3np978Gv2km/qZfZ9S
-ghS+l/RKumdwWHNeqgFL8zXidRKVQtyJ1bYgEGDMd3JGvQ5HEFrwKvSHSFHJuWSsZQiJwg
-rRFeJTuc2Lkp2e+KDL9+8mkEQhxJRZ7Zf8ahSsG840YLzgS4NfB5CvW/+SGe04Jr269L79
-Xz/eIoH88zn9hZwgAAABAQDQrFsfvqhQ9Ez9GlJaHJRfwMaLC1Wvo9WD97z5hp/1Sg42v+
-VDSq5WoXUFCyeY3ZqoD9hmnNUwPWAqiQs6Ah91h6qfb52cU0cPPbCeC1iuy9uUkLRvDue1
-WIhaUIg/BqvKwz6iXKRh93CikLMIx5Zr3z9bCTZkrI2m9e7FU1DxF9jCYxnU1ldN9P9I1F
-A/5vz5MR8VehlfSXq6xfe7TWwLUBZrYS+ruw6rg9g65dKIHQtSnknumAaDgqpCGiMCI/r0
-XIshSE6S7C1skHCxmXcvjO1JpAe7iORKFqDEmGwjcrZ53soblGRtGdHlM+FFmLPrOzOOU1
-ZnEBBq7pnPoDjTAAABAQDQVwmKC4q7mYoyj8mNPxahtGFomQA0O7fmMOp+qaCYSK8raRfU
-b1owHcEMNt5pC2ZkO1o1LfmFSMaVquKQ/n2KC9hquMafKtgHiOGyz/nLM0jWjoJpVToF4J
-GdMzU9wW6MshhA+ZSTFEzMQ88MOaqrrZHdY90subqx5pQ7O1S/a2BJYSEjRg5Z8cONS828
-Ph9OZn3NntWn3go4wZ8U35nwxQdZDpIUDdeRR0g9127KCMS2eTtMbNMUiGmOhv1YcvBLNU
-bLm4xDmqWBXwnplFuwU9gre1vBcKEsV3ybO+udPjOb3t/WscEko4/Qnv8kx+jQmg5Z8vDh
-ZjR8vSMlZvCJAAAAF2tleV9yc2Ffc2hhMl8yNTZfc2lnbmVkAQID
-----END OPENSSH PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
--- a/tests/keys/id_rsa_signed
+++ b/tests/keys/id_rsa_signed
@@ -1,49 +1,51 @@
-----BEGIN OPENSSH PRIVATE KEY-----
-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
-----END OPENSSH PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
--- a/tests/test_auth_pubkey_ok_rsa_sha2_512_signed.c
+++ b/tests/test_auth_pubkey_ok_rsa_sha2_512_signed.c
@@ -9,8 +9,7 @@

 int test(LIBSSH2_SESSION *session)
 {
-#if LIBSSH2_RSA_SHA2 && \
-    (defined(LIBSSH2_OPENSSL) || defined(LIBSSH2_WOLFSSL))
+#if LIBSSH2_RSA_SHA2
    const char *user = getenv("FIXTURE_USER");
    /* set in Dockerfile */
    return test_auth_pubkey(session, 0,
--- a/tests/test_auth_pubkey_ok_rsa_signed.c
+++ b/tests/test_auth_pubkey_ok_rsa_signed.c
@@ -9,8 +9,7 @@

 int test(LIBSSH2_SESSION *session)
 {
-#if LIBSSH2_RSA_SHA1 && \
-    (defined(LIBSSH2_OPENSSL) || defined(LIBSSH2_WOLFSSL))
+#if LIBSSH2_RSA_SHA1
    const char *user = getenv("FIXTURE_USER");
    /* set in Dockerfile */
    return test_auth_pubkey(session, 0,