added context to pcp_readpass(), rm libpcp/getpass.c

src/Makefile.am

@@ -20,14 +20,14 @@
 #
 
 
-AM_CFLAGS = -I../include/pcp -I../libpcp/scrypt/crypto
+AM_CFLAGS = -I../include/pcp
 
 EXTRA_DIST = *.h
 
 bin_PROGRAMS = pcp1
 
 pcp1_LDADD = ../libpcp/.libs/libpcp1.a
-pcp1_SOURCES = pcp.c keymgmt.c keyprint.c readpass.c \
+pcp1_SOURCES = pcp.c keymgmt.c keyprint.c \
                encryption.c z85util.c signature.c \
                compat_getopt.c
 

src/encryption.c

@@ -66,7 +66,7 @@ int pcpdecrypt(char *id, int useid, char *infile, char *outfile, char *passwd, i
 
       char *passphrase;
       if(passwd == NULL) {
-	pcp_readpass(&passphrase,
+	pcp_readpass(ptx, &passphrase,
 		     "Enter passphrase for symetric decryption", NULL, 1, NULL);
       }
       else {
@@ -99,7 +99,7 @@ int pcpdecrypt(char *id, int useid, char *infile, char *outfile, char *passwd, i
 	/*  encrypted, decrypt it */
 	char *passphrase;
 	if(passwd == NULL) {
-	  pcp_readpass(&passphrase,
+	  pcp_readpass(ptx, &passphrase,
 		       "Enter passphrase to decrypt your secret key", NULL, 1, NULL);
 	}
 	else {
@@ -135,6 +135,7 @@ int pcpdecrypt(char *id, int useid, char *infile, char *outfile, char *passwd, i
   else {
     dlen = pcp_decrypt_stream(ptx, pin, pout, NULL, symkey, verify, 0);
     sfree(symkey);
+    symkey = NULL;
   }
 
   ps_close(pin);
@@ -151,7 +152,7 @@ int pcpdecrypt(char *id, int useid, char *infile, char *outfile, char *passwd, i
 
  errde3:
   if(symkey != NULL)
-     free(symkey);
+     sfree(symkey);
 
   return 1;
 }
@@ -173,7 +174,7 @@ int pcpencrypt(char *id, char *infile, char *outfile, char *passwd, plist_t *rec
     symmode = 1;
     char *passphrase;
     if(passwd == NULL) {
-      pcp_readpass(&passphrase,
+      pcp_readpass(ptx, &passphrase,
                    "Enter passphrase for symetric encryption", "Repeat passphrase", 1, NULL);
     }
     else {
@@ -267,7 +268,7 @@ int pcpencrypt(char *id, char *infile, char *outfile, char *passwd, plist_t *rec
         /*  encrypted, decrypt it */
         char *passphrase;
 	if(passwd == NULL) {
-          pcp_readpass(&passphrase,
+          pcp_readpass(ptx, &passphrase,
 		       "Enter passphrase to decrypt your secret key", NULL, 1, NULL);
         }
 	else {

src/keymgmt.c

@@ -77,7 +77,7 @@ void pcp_keygen(char *passwd) {
 
   char *passphrase;
   if(passwd == NULL) {
-    pcp_readpass(&passphrase,
+    pcp_readpass(ptx, &passphrase,
 		 "Enter passphrase for key encryption",
 		 "Enter the passphrase again", 1, NULL);
   }
@@ -230,7 +230,7 @@ void pcp_exportsecret(char *keyid, int useid, char *outfile, int armor, char *pa
       /* decrypt the secret key */
       if(passwd == NULL) {
 	char *passphrase;
-	pcp_readpass(&passphrase,
+	pcp_readpass(ptx, &passphrase,
 		     "Enter passphrase to decrypt your secret key", NULL, 1, NULL);
 	key = pcpkey_decrypt(ptx, key, passphrase);
 	if(key == NULL) {
@@ -254,7 +254,7 @@ void pcp_exportsecret(char *keyid, int useid, char *outfile, int armor, char *pa
     }
     else {
       char *passphrase;
-      pcp_readpass(&passphrase,
+      pcp_readpass(ptx, &passphrase,
                   "Enter passphrase to encrypt the exported secret key",
 		   "Repeat passphrase", 1, NULL);
       exported_sk = pcp_export_secret(ptx, key, passphrase);
@@ -344,7 +344,7 @@ void pcp_exportpublic(char *keyid, char *passwd, char *outfile, int format, int
     }
     else {
       char *passphrase;
-      pcp_readpass(&passphrase,
+      pcp_readpass(ptx, &passphrase,
 		   "Enter passphrase to decrypt your secret key", NULL, 1, NULL);
       sk = pcpkey_decrypt(ptx, sk, passphrase);
       sfree(passphrase);
@@ -431,7 +431,7 @@ void pcpedit_key(char *keyid) {
   if(key != NULL) {
     if(key->secret[0] == 0) {
       char *passphrase;
-      pcp_readpass(&passphrase, "Enter passphrase to decrypt the key", NULL, 1, NULL);
+      pcp_readpass(ptx, &passphrase, "Enter passphrase to decrypt the key", NULL, 1, NULL);
       key = pcpkey_decrypt(ptx, key, passphrase);
       sfree(passphrase);
     }
@@ -482,7 +482,7 @@ void pcpedit_key(char *keyid) {
       }
 
       char *passphrase;
-      pcp_readpass(&passphrase,
+      pcp_readpass(ptx, &passphrase,
 		   "Enter new passphrase for key encryption (press enter to keep current)",
 		   "Enter the passphrase again", 1, NULL);
 
@@ -592,7 +592,7 @@ int pcp_import (vault_t *vault, FILE *in, char *passwd) {
     }
     else {
       char *passphrase;
-      pcp_readpass(&passphrase,
+      pcp_readpass(ptx, &passphrase,
 		   "Enter passphrase to decrypt the secret key file", NULL, 1, NULL);
       sk = pcp_import_secret(ptx, buf, bufsize, passphrase);
       sfree(passphrase);
@@ -617,7 +617,7 @@ int pcp_import (vault_t *vault, FILE *in, char *passwd) {
     }
     else {
       char *passphrase;
-      pcp_readpass(&passphrase,
+      pcp_readpass(ptx, &passphrase,
 		   "Enter passphrase for key encryption",
 		   "Enter the passphrase again", 1, NULL);
     

src/signature.c

@@ -58,7 +58,7 @@ int pcpsign(char *infile, char *outfile, char *passwd, int z85, int detach) {
     /*  encrypted, decrypt it */
     char *passphrase;
     if(passwd == NULL) {
-      pcp_readpass(&passphrase,
+      pcp_readpass(ptx, &passphrase,
 		   "Enter passphrase to decrypt your secret key", NULL, 1, NULL);
     }
     else {