scip/pcp
1
0
Fork 0
mirror of https://codeberg.org/scip/pcp.git synced 2025-12-17 03:50:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

added extpass option

Browse Source
This commit is contained in:
TLINDEN
2015-07-30 11:46:17 +02:00
parent deeb15e851
commit 0046db9136
10 changed files with 162 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/pcp.c
View File

@@ -66,6 +66,7 @@ int main (int argc, char **argv) {
char *xpassfile = NULL;
char *extra = NULL;
plist_t *recipient = NULL;
char *askpass = NULL;
FILE *in;
errno = 0;
@@ -93,6 +94,7 @@ int main (int argc, char **argv) {
{ "text", required_argument, NULL, 't' },
{ "xpass", required_argument, NULL, 'x' },
{ "password-file", required_argument, NULL, 'X' },
{ "extpass", required_argument, NULL, LONG_EXTPASS },
{ "recipient", required_argument, NULL, 'r' },
/* key management */
@@ -271,6 +273,10 @@ int main (int argc, char **argv) {
if(strncmp(xpass, "n/a", 3) == 0)
xpass[0] = '\0';
break;
case LONG_EXTPASS:
askpass = malloc(strlen(optarg)+1);
strncpy(askpass, optarg, strlen(optarg)+1);
break;
case 'r':
p_add(&recipient, optarg);
userec = 1;
@@ -415,12 +421,18 @@ int main (int argc, char **argv) {
}
if(xpassfile != NULL) {
pcp_readpass(&xpass, "passphrase", NULL, 0, xpassfile);
if(pcp_readpass(ptx, &xpass, "passphrase", NULL, 0, xpassfile) != 0)
goto perr1;
if(xpassfile[0] != '-')
xpf = 0;
free(xpassfile);
}
if(askpass != NULL) {
if(pcp_readpass_fromprog(ptx, &xpass, askpass) != 0)
goto perr1;
}
/* check if there's some enviroment we could use */
if(usevault == 1) {
char *_vaultfile = getenv("PCP_VAULT");
@@ -631,7 +643,8 @@ int main (int argc, char **argv) {
break;
}
}
perr1:
fatals_ifany(ptx);
int e = ptx->pcp_exit;
ptx_clean(ptx);
@@ -646,6 +659,10 @@ int main (int argc, char **argv) {
free(sigfile);
if(xpass != NULL)
sfree(xpass);
if(askpass != NULL)
free(askpass);
if(xpassfile != NULL)
free(xpassfile);
if(recipient != NULL)
p_clean(recipient);
if(id != NULL)