summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Engel <cjengel@us.ibm.com>2017-10-11 11:35:05 -0500
committerGitHub <noreply@github.com>2017-10-11 11:35:05 -0500
commitc564fa54093c0e634f0276e509946b746f94bca4 (patch)
treea3929fca57d759ea74c68d373bdb534a0a70788f
parent02ed29aa11136a6d9a6e1f075772532c43cb7289 (diff)
parent379e1305c1f983832e59951e78d3cee1891811e4 (diff)
downloadsb-signing-framework-c564fa54093c0e634f0276e509946b746f94bca4.tar.gz
sb-signing-framework-c564fa54093c0e634f0276e509946b746f94bca4.zip
Merge pull request #1 from mtvaught-ibm/master
Added workaround for RedHat curl bug.
-rw-r--r--src/client/pscp_sftp.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/client/pscp_sftp.c b/src/client/pscp_sftp.c
index 813950f..aede734 100644
--- a/src/client/pscp_sftp.c
+++ b/src/client/pscp_sftp.c
@@ -98,6 +98,13 @@ struct pscp_sftp_session* startSftpSession(const char * sftp_url, const char *
if(status == CURLE_OK) status = curl_easy_setopt(sftp->curl, CURLOPT_SSH_PRIVATE_KEYFILE, privateKeyPath);
if(status == CURLE_OK)
{
+ // Workaround for RedHat bug 1260742 - curl requiring public key
+ char pubKeyPath[PATH_MAX];
+ snprintf(pubKeyPath, PATH_MAX, "%s.pub", privateKeyPath);
+ status = curl_easy_setopt(sftp->curl, CURLOPT_SSH_PUBLIC_KEYFILE, pubKeyPath);
+ }
+ if(status == CURLE_OK)
+ {
char passphrase[PSCP_PKEY_PASSPHRASE_MAX];
bzero(passphrase, PSCP_PKEY_PASSPHRASE_MAX);
status = GetPassword(passphrase, PSCP_PKEY_PASSPHRASE_MAX, verbose);
OpenPOWER on IntegriCloud