From 6aa289c124bd823ee352fa5bda5c9d7c792c7bf5 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sun, 17 Nov 2013 01:08:10 +0100
Subject: Remove main from libdispass, add test executable

- Add ~dispasstest~ which is used to test the DisPass algorithms.
- Remove =main= from libdispass since shared libraries shouldn't have
  main functions
- Add ~dispass.h~ which defines and exports the DisPass algorithms.
- Make some functions in ~dispass.c~ static to make clear they're not
  exported anywhere.
---
 dispass.c | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

(limited to 'dispass.c')

diff --git a/dispass.c b/dispass.c
index 3024845..4f0c88a 100644
--- a/dispass.c
+++ b/dispass.c
@@ -4,10 +4,12 @@
 #include <openssl/pem.h>
 #include <limits.h>
 
+#include "dispass.h"
+
 #define MIN(A, B) ((A) < (B) ? (A) : (B))
 #define MAXLEN (SHA512_DIGEST_LENGTH * 2)
 
-char *
+static char *
 base64encode(const void *data, int len)
 { /* Copied from http://stackoverflow.com/a/16511093/459915 */
     BIO *b64_bio, *mem_bio;
@@ -34,7 +36,7 @@ base64encode(const void *data, int len)
     return ret;
 }
 
-void
+static void
 sha512_to_string(unsigned char *data, char *buff)
 {
     int i;
@@ -46,7 +48,7 @@ sha512_to_string(unsigned char *data, char *buff)
     }
 }
 
-void
+static void
 rmchar(char rm, char **s)
 {
     int i, j = 0;
@@ -114,25 +116,3 @@ dispass2(char *label, char *password, int len, long long unsigned seqno)
 
     return b64;
 }
-
-int main(int argc, char *argv[])
-{
-    char *test1, *test2, *test3, *test4;
-
-    test1 = dispass1("test", "qqqqqqqq", 30, 0);
-    test2 = dispass1("test2", "qqqqqqqq", 50, 0);
-    test3 = dispass2("test", "qqqqqqqq", 30, 1);
-    test4 = dispass2("test2", "qqqqqqqq", 50, 10);
-
-    printf("%s\n", test1);
-    printf("%s\n", test2);
-    printf("%s\n", test3);
-    printf("%s\n", test4);
-
-    free(test1);
-    free(test2);
-    free(test3);
-    free(test4);
-
-    return 0;
-}
-- 
cgit v1.2.3-54-g00ecf