From 336221e5e2240545a9a8602d81424e1dc15db4f6 Mon Sep 17 00:00:00 2001
From: sw1tchbl4d3 <sw1tchbl4d3@sw1tchbl4d3.com>
Date: Tue, 13 Jul 2021 22:23:27 +0200
Subject: [PATCH] Get passphrase from TTY

This is required for #1.
---
 Makefile |  2 +-
 rdo.c    | 23 ++++++-----------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index a0c540c..fb12210 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 rdo: rdo.c
-	gcc rdo.c -lcrypt -o rdo -Wall
+	gcc rdo.c -lcrypt -lbsd -o rdo -Wall
 
 install: rdo
 	cp rdo /usr/bin/rdo
diff --git a/rdo.c b/rdo.c
index 2905145..42467d4 100644
--- a/rdo.c
+++ b/rdo.c
@@ -4,22 +4,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
-#include <termios.h>
-
-void getpwd(char* password){
-	struct termios raw;
-	tcgetattr(STDIN_FILENO, &raw);
-	raw.c_lflag &= ~ECHO;
-	tcsetattr(STDIN_FILENO, 0, &raw);
-	
-	printf("Password: ");
-	fgets(password, 128, stdin);
-	password[strcspn(password, "\n")] = 0;
-	
-	raw.c_lflag |= ECHO;
-	tcsetattr(STDIN_FILENO, 0, &raw);
-	printf("\n");
-}
+#include <bsd/readpassphrase.h>
 
 void runprog(int argc, char** argv) {
 	for(int i=0; i<argc; i++)
@@ -76,7 +61,11 @@ int main(int argc, char** argv) {
 	int tries = 0;
 	char password[128];
 	while (tries < 3) {
-		getpwd(password);
+		if (!readpassphrase("(rdo) Password: ", password, sizeof(password), RPP_REQUIRE_TTY)) {
+			fprintf(stderr, "Could not get passphrase, not in a TTY?\n");
+			return -7;
+		}
+
 		if (strcmp(shadowEntry->sp_pwdp, crypt(password, shadowEntry->sp_pwdp)) == 0) {
 			runprog(argc, argv);
             return 0;