X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=mnencd.cpp;fp=mnencd.cpp;h=68be9a5dac5b07ece3aa2c3e81395d4e0aeabc0c;hb=c6bc8721b6091a5a7e130ffb0837a21bede85b4f;hp=b41943249f518af498b8e4957bcd73d206a241bf;hpb=4d430223b2b38f9899844bc55e66aace6bb80fe1;p=mnenc

diff --git a/mnencd.cpp b/mnencd.cpp
index b419432..68be9a5 100644
--- a/mnencd.cpp
+++ b/mnencd.cpp
@@ -40,63 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <iostream>
 #include "mnenc.hpp"
 #include "password.hpp"
-
-std::string remove_char(std::string str, char c) {
-	std::string::size_type k = 0;
-	while((k=str.find(c,k))!=str.npos) {
-		str.erase(k, 1);
-	}
-	return str;
-}
-
-std::string remove_chars(std::string str) {
-	std::string chars = " \t\n\b\a-?+\\{[]}'*'";
-	for(int i = 0; i < (signed) chars.size(); i++) {
-		str = remove_char(str, chars[i]);
-	}
-	
-	return str;	
-}
-
-std::string make_filename(std::string user, std::string app) {
-	return remove_chars(app + user);
-}
-std::string get_password(std::string masterpasswd, std::string user, std::string app) {
-	mnenc menc = mnenc();
-	menc.genkey(masterpasswd);
-	std::string key = menc.get_key();
-	password pw = password("", "", key);
-	pw.from_file(make_filename(user, app));
-	return menc.decrypt(key, pw.get_enc());
-}
-
-void put_password(std::string masterpasswd, std::string passwd, std::string user, std::string app) {
-	mnenc menc = mnenc();
-	menc.genkey(masterpasswd);
-	std::string key = menc.get_key();
-	password pw = password(menc.encrypt(key, passwd ), "", key);
-	pw.to_file(make_filename(user, app));
-}
-
-std::string do_something(std::string str) {
-	//Nothing here yet
-	return "Blahonga";
-}
-
-std::string m_read() {
-	std::string str;
-	std::ifstream is("fife");
-	getline(is, str);
-	is.close();
-	return str;
-}
-
-void m_send(std::string message) {
-	std::ofstream os("fife");
-	os << message;
-	os.close();
-}
-
+#include "mnencd.hpp"
 
 int main(int argc, char** argv) {
 	/* Our process ID and Session ID */
@@ -142,7 +86,9 @@ int main(int argc, char** argv) {
 
 	/* The Big Loop */
 	while (1) {
-		m_send(do_something(m_read()));
+		std::string request = m_read();
+		std::string reply = do_something(request);
+		m_send(reply);
 		sleep(1); /* wait 1 second*/
 	}
 	unlink("fife");