Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a QTDialog for the gpg key passphrase input

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1790 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-10-30 21:26:35 +00:00
parent 6e225dec47
commit 3fc211ab15
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libretroshare/src/pqi/authgpg.cc
View File

@ -56,7 +56,7 @@
#include "authgpg.h" #include "authgpg.h"
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <QtGui>
/* Turn a set of parameters into a string */ /* Turn a set of parameters into a string */
static std::string setKeyPairParams(bool useRsa, unsigned int blen, static std::string setKeyPairParams(bool useRsa, unsigned int blen,
@ -100,7 +100,10 @@ gpgcert::~gpgcert()
gpg_error_t pgp_pwd_callback(void *hook, const char *uid_hint, const char *passphrase_info, int prev_was_bad, int fd) gpg_error_t pgp_pwd_callback(void *hook, const char *uid_hint, const char *passphrase_info, int prev_was_bad, int fd)
{ {
const char *passwd = (const char *) hook; QString text = QInputDialog::getText(NULL, "GPG key passphrase",
"GPG key passphrase", QLineEdit::Password,
NULL, NULL);
if (prev_was_bad) if (prev_was_bad)
fprintf(stderr, "pgp_pwd_callback() Prev was bad!\n"); fprintf(stderr, "pgp_pwd_callback() Prev was bad!\n");
@ -108,12 +111,12 @@ gpg_error_t pgp_pwd_callback(void *hook, const char *uid_hint, const char *passp
fprintf(stderr, "pgp_pwd_callback() Set Password\n"); fprintf(stderr, "pgp_pwd_callback() Set Password\n");
#ifndef WINDOWS_SYS #ifndef WINDOWS_SYS
write(fd, passwd, strlen(passwd)); write(fd, text.toStdString().c_str(), text.length());
write(fd, "\n", 1); /* needs a new line? */ write(fd, "\n", 1); /* needs a new line? */
#else #else
DWORD written = 0; DWORD written = 0;
HANDLE winFd = (HANDLE) fd; HANDLE winFd = (HANDLE) fd;
WriteFile(winFd, passwd, strlen(passwd), &written, NULL); WriteFile(winFd, text.toStdString().c_str(), text.length(), &written, NULL);
WriteFile(winFd, "\n", 1, &written, NULL); WriteFile(winFd, "\n", 1, &written, NULL);
#endif #endif