ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2026-01-05 08:00:05 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement passphrase input.

Browse source
This commit is contained in:
Con Kolivas 2011-03-15 16:32:32 +11:00
parent 202d972a6c
commit 412cf013c4
4 changed files with 59 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lrzip.c
View file

@ -35,6 +35,7 @@
#include <errno.h>
#endif
#include <sys/time.h>
#include <termios.h>
#include "md5.h"
#include "rzip.h"
@ -843,8 +844,44 @@ void compress_file(rzip_control *control)
const char *tmp, *tmpinfile; /* we're just using this as a proxy for control->infile.
* Spares a compiler warning
*/
int fd_in, fd_out;
int fd_in, fd_out, i = 0;
char header[MAGIC_LEN];
char *passphrase, *testphrase;
if (ENCRYPT) {
struct termios termios_p;
passphrase = calloc(PASS_LEN, 1);
testphrase = calloc(PASS_LEN, 1);
if (unlikely(!passphrase || !testphrase))
fatal("Failed to calloc passphrase ram\n");
mlock(passphrase, PASS_LEN);
mlock(testphrase, PASS_LEN);
/* Disable stdin echo to screen */
tcgetattr(fileno(stdin), &termios_p);
retry_pass:
print_output("Enter passphrase: ");
termios_p.c_lflag &= ~ECHO;
tcsetattr(fileno(stdin), 0, &termios_p);
if (unlikely(fgets(passphrase, PASS_LEN, stdin) == NULL))
failure("Empty passphrase\n");
print_output("\nRe-enter passphrase: ");
if (unlikely(fgets(testphrase, PASS_LEN, stdin) == NULL))
failure("Empty passphrase\n");
termios_p.c_lflag |= ECHO;
tcsetattr(fileno(stdin), 0, &termios_p);
print_output("\n");
if (strcmp(passphrase, testphrase)) {
print_output("Passwords do not match. Try again.\n");
goto retry_pass;
}
/* Do stuff here with password */
free(passphrase);
free(testphrase);
munlockall();
}
memset(header, 0, sizeof(header));

2
lrzip_private.h
View file

@ -135,6 +135,8 @@ typedef struct md5_ctx md5_ctx;
#define CTYPE_GZIP 7
#define CTYPE_ZPAQ 8
#define PASS_LEN 512
/* Needs to be less than 31 bits and page aligned on 32 bits */
#define two_gig ((1ull << 31) - 4096)

12
main.c
View file

@ -36,6 +36,7 @@
# include <sys/resource.h>
#endif
#include <math.h>
#include <termios.h>
#include "rzip.h"
#include "lrzip.h"
@ -203,9 +204,15 @@ static void usage(void)
}
static void sighandler(int sig __UNUSED__)
{
struct termios termios_p;
/* Make sure we haven't died after disabling stdin echo */
tcgetattr(fileno(stdin), &termios_p);
termios_p.c_lflag |= ECHO;
tcsetattr(fileno(stdin), 0, &termios_p);
unlink_files();
exit(0);
}
@ -768,6 +775,9 @@ int main(int argc, char *argv[])
gettimeofday(&start_time, NULL);
if (unlikely(STDIN && ENCRYPT))
failure("Unable to work from STDIN while reading password\n");
if (DECOMPRESS || TEST_ONLY)
decompress_file(&control);
else if (INFO)

8
util.c
View file

@ -38,6 +38,7 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <termios.h>
#ifdef _SC_PAGE_SIZE
# define PAGE_SIZE (sysconf(_SC_PAGE_SIZE))
@ -86,6 +87,13 @@ void unlink_files(void)
static void fatal_exit(void)
{
struct termios termios_p;
/* Make sure we haven't died after disabling stdin echo */
tcgetattr(fileno(stdin), &termios_p);
termios_p.c_lflag |= ECHO;
tcsetattr(fileno(stdin), 0, &termios_p);
unlink_files();
fprintf(outputfile, "Fatal error - exiting\n");
fflush(outputfile);