diff mbox series

[FFmpeg-devel] avformat/libssh: avoid deprecated functions

Message ID 20230913104056.40762-1-leo.izen@gmail.com
State Accepted
Commit 9b454fdaef413edfc8e0473569462271a64c59fb
Headers show
Series [FFmpeg-devel] avformat/libssh: avoid deprecated functions | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Leo Izen Sept. 13, 2023, 10:40 a.m. UTC 
Avoid using the deprecated functions ssh_try_publickey_from_file among
others in favor of symbols introduced in libssh 0.6.0 (Jan 2014) and
update configure to require this version.

Signed-off-by: Leo Izen <leo.izen@gmail.com>
---
 configure            |  2 +-
 libavformat/libssh.c | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

Comments

Leo Izen Sept. 16, 2023, 6:08 p.m. UTC | #1 
On 9/13/23 06:40, Leo Izen wrote:
> Avoid using the deprecated functions ssh_try_publickey_from_file among
> others in favor of symbols introduced in libssh 0.6.0 (Jan 2014) and
> update configure to require this version.
> 
> Signed-off-by: Leo Izen <leo.izen@gmail.com>
> ---
>   configure            |  2 +-
>   libavformat/libssh.c | 11 ++++-------
>   2 files changed, 5 insertions(+), 8 deletions(-)
> 

Will apply soon.

- Leo Izen (Traneptora)
diff mbox series

Patch

diff --git a/configure b/configure
index bd7f7697c8..48fee07f81 100755
--- a/configure
+++ b/configure
@@ -6796,7 +6796,7 @@  enabled libsmbclient      && { check_pkg_config libsmbclient smbclient libsmbcli
                                require libsmbclient libsmbclient.h smbc_init -lsmbclient; }
 enabled libsnappy         && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
 enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr
-enabled libssh            && require_pkg_config libssh libssh libssh/sftp.h sftp_init
+enabled libssh            && require_pkg_config libssh "libssh >= 0.6.0" libssh/sftp.h sftp_init
 enabled libspeex          && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
 enabled libsrt            && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket
 enabled libsvtav1         && require_pkg_config libsvtav1 "SvtAv1Enc >= 0.9.0" EbSvtAv1Enc.h svt_av1_enc_init_handle
diff --git a/libavformat/libssh.c b/libavformat/libssh.c
index 21474f0f0a..127faaabd3 100644
--- a/libavformat/libssh.c
+++ b/libavformat/libssh.c
@@ -84,12 +84,9 @@  static av_cold int libssh_authentication(LIBSSHContext *libssh, const char *user
 
     if (auth_methods & SSH_AUTH_METHOD_PUBLICKEY) {
         if (libssh->priv_key) {
-            ssh_string pub_key;
-            ssh_private_key priv_key;
-            int type;
-            if (!ssh_try_publickey_from_file(libssh->session, libssh->priv_key, &pub_key, &type)) {
-                priv_key = privatekey_from_file(libssh->session, libssh->priv_key, type, password);
-                if (ssh_userauth_pubkey(libssh->session, NULL, pub_key, priv_key) == SSH_AUTH_SUCCESS) {
+            ssh_key priv_key;
+            if (ssh_pki_import_privkey_file(libssh->priv_key, password, NULL, NULL, &priv_key) == SSH_OK) {
+                if (ssh_userauth_publickey(libssh->session, NULL, priv_key) == SSH_AUTH_SUCCESS) {
                     av_log(libssh, AV_LOG_DEBUG, "Authentication successful with selected private key.\n");
                     authorized = 1;
                 }
@@ -97,7 +94,7 @@  static av_cold int libssh_authentication(LIBSSHContext *libssh, const char *user
                 av_log(libssh, AV_LOG_DEBUG, "Invalid key is provided.\n");
                 return AVERROR(EACCES);
             }
-        } else if (ssh_userauth_autopubkey(libssh->session, password) == SSH_AUTH_SUCCESS) {
+        } else if (ssh_userauth_publickey_auto(libssh->session, NULL, password) == SSH_AUTH_SUCCESS) {
             av_log(libssh, AV_LOG_DEBUG, "Authentication successful with auto selected key.\n");
             authorized = 1;
         }