test-dict-otp: moving OTP dictionaries from library to test sources

15 files changed, 84 insertions, 32 deletions

diff --git a/Makefile.am b/Makefile.am
index 87ffbf9..6f791ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -105,6 +105,7 @@ EXTRA_DIST				= $(noinst_HEADERS) \
                                           TODO.md \
                                           include/otputil.h \
                                           lib/libotputil/libotputil.sym \
+                                          tests/otp-dicts/otp-dicts.h \
                                           tests/test-otputil-hotp.sh \
                                           tests/test-otputil-totp.sh
 CLEANFILES                              = $(builddir)/a.out   $(srcdir)/a.out \
@@ -167,13 +168,7 @@ lib_libotputil_a_SOURCES		= $(noinst_HEADERS) \
                                           $(BINDLE_LIBBINDLE_SRCS) \
                                           lib/libotputil/libotputil.h \
                                           lib/libotputil/libotputil.c \
-                                          lib/libotputil/ldict-otp-md4.c \
-                                          lib/libotputil/ldict-otp-md5.c \
-                                          lib/libotputil/ldict-otp-sha1.c \
-                                          lib/libotputil/ldict-rfc1760.c \
-                                          lib/libotputil/ldict-rfc2289-md4.c \
-                                          lib/libotputil/ldict-rfc2289-md5.c \
-                                          lib/libotputil/ldict-rfc2289-sha1.c
+                                          lib/libotputil/ldict-rfc1760.c
 
 
 # macros for lib/libotputil.la
@@ -205,7 +200,13 @@ src_otputil_SOURCES			= src/otputil.c \
 # macros for tests/test-dict-otp
 tests_test_dict_otp_DEPENDENCIES        = Makefile $(noinst_LIBRARIES) $(lib_LTLIBRARIES)
 tests_test_dict_otp_LDADD               = $(AM_LIBS) $(noinst_LIBRARIES) $(lib_LTLIBRARIES)
-tests_test_dict_otp_SOURCES             = tests/test-dict-otp.c
+tests_test_dict_otp_SOURCES             = tests/test-dict-otp.c \
+                                          tests/otp-dicts/otp-md4.c \
+                                          tests/otp-dicts/otp-md5.c \
+                                          tests/otp-dicts/otp-sha1.c \
+                                          tests/otp-dicts/rfc2289-md4.c \
+                                          tests/otp-dicts/rfc2289-md5.c \
+                                          tests/otp-dicts/rfc2289-sha1.c
 
 
 # macros for tests/test-hotp
diff --git a/tests/otp-dicts/otp-dicts.h b/tests/otp-dicts/otp-dicts.h
new file mode 100644
index 0000000..fa6b59f
--- /dev/null
+++ b/tests/otp-dicts/otp-dicts.h
@@ -0,0 +1,61 @@
+/*
+ *  OTP Utilities
+ *  Copyright (C) 2022 David M. Syzdek <david@syzdek.net>.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of David M. Syzdek nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID M SYZDEK BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ *  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ *  SUCH DAMAGE.
+ */
+/*
+ *  @file lib/libotputil/libotputil.c
+ */
+#ifndef _TESTS_OTP_DICTS_OTP_DICTS_H
+#define _TESTS_OTP_DICTS_OTP_DICTS_H 1
+
+///////////////
+//           //
+//  Headers  //
+//           //
+///////////////
+#pragma mark - Headers
+
+#include <stdio.h>
+
+
+/////////////////
+//             //
+//  Variables  //
+//             //
+/////////////////
+#pragma mark - Variables
+
+extern const char * otputil_dict_otp_md4[];
+extern const char * otputil_dict_otp_md5[];
+extern const char * otputil_dict_otp_sha1[];
+extern const char * otputil_dict_rfc2289_md4[];
+extern const char * otputil_dict_rfc2289_md5[];
+extern const char * otputil_dict_rfc2289_sha1[];
+
+
+#endif /* end of header file */
diff --git a/lib/libotputil/ldict-otp-md4.c b/tests/otp-dicts/otp-md4.c
index fb0eb09..379e960 100644
--- a/lib/libotputil/ldict-otp-md4.c
+++ b/tests/otp-dicts/otp-md4.c
@@ -30,9 +30,8 @@
 /*
  *  @file lib/libotputil/libotputil.c
  */
-#define _LIB_LDICT_OTP_MD5_C 1
-#include "libotputil.h"
-
+#define _TESTS_OTP_DICTS_OTP_MD4_C 1
+#include "otp-dicts.h"
 
 /////////////////
 //             //
diff --git a/lib/libotputil/ldict-otp-md4.txt b/tests/otp-dicts/otp-md4.txt
index d221f3b..d221f3b 100644
--- a/lib/libotputil/ldict-otp-md4.txt
+++ b/tests/otp-dicts/otp-md4.txt
diff --git a/lib/libotputil/ldict-otp-md5.c b/tests/otp-dicts/otp-md5.c
index 558cb50..8639357 100644
--- a/lib/libotputil/ldict-otp-md5.c
+++ b/tests/otp-dicts/otp-md5.c
@@ -30,9 +30,8 @@
 /*
  *  @file lib/libotputil/libotputil.c
  */
-#define _LIB_LDICT_OTP_MD5_C 1
-#include "libotputil.h"
-
+#define _TESTS_OTP_DICTS_OTP_MD5_C 1
+#include "otp-dicts.h"
 
 /////////////////
 //             //
diff --git a/lib/libotputil/ldict-otp-md5.txt b/tests/otp-dicts/otp-md5.txt
index ed9fbe6..ed9fbe6 100644
--- a/lib/libotputil/ldict-otp-md5.txt
+++ b/tests/otp-dicts/otp-md5.txt
diff --git a/lib/libotputil/ldict-otp-sha1.c b/tests/otp-dicts/otp-sha1.c
index d708ef2..549ba47 100644
--- a/lib/libotputil/ldict-otp-sha1.c
+++ b/tests/otp-dicts/otp-sha1.c
@@ -30,9 +30,8 @@
 /*
  *  @file lib/libotputil/libotputil.c
  */
-#define _LIB_LDICT_OTP_SHA1_C 1
-#include "libotputil.h"
-
+#define _TESTS_OTP_DICTS_OTP_SHA1_C 1
+#include "otp-dicts.h"
 
 /////////////////
 //             //
diff --git a/lib/libotputil/ldict-otp-sha1.txt b/tests/otp-dicts/otp-sha1.txt
index 64ee4e1..64ee4e1 100644
--- a/lib/libotputil/ldict-otp-sha1.txt
+++ b/tests/otp-dicts/otp-sha1.txt
diff --git a/lib/libotputil/ldict-rfc2289-md4.c b/tests/otp-dicts/rfc2289-md4.c
index 4a688d8..9c9d98e 100644
--- a/lib/libotputil/ldict-rfc2289-md4.c
+++ b/tests/otp-dicts/rfc2289-md4.c
@@ -30,9 +30,8 @@
 /*
  *  @file lib/libotputil/libotputil.c
  */
-#define _LIB_LDICT_OTP_MD5_C 1
-#include "libotputil.h"
-
+#define _TESTS_OTP_DICTS_OTP_MD5_C 1
+#include "otp-dicts.h"
 
 /////////////////
 //             //
diff --git a/lib/libotputil/ldict-rfc2289-md4.txt b/tests/otp-dicts/rfc2289-md4.txt
index 794b5e8..794b5e8 100644
--- a/lib/libotputil/ldict-rfc2289-md4.txt
+++ b/tests/otp-dicts/rfc2289-md4.txt
diff --git a/lib/libotputil/ldict-rfc2289-md5.c b/tests/otp-dicts/rfc2289-md5.c
index 4ae9fa6..8c1b4a2 100644
--- a/lib/libotputil/ldict-rfc2289-md5.c
+++ b/tests/otp-dicts/rfc2289-md5.c
@@ -30,9 +30,8 @@
 /*
  *  @file lib/libotputil/libotputil.c
  */
-#define _LIB_LDICT_OTP_MD5_C 1
-#include "libotputil.h"
-
+#define _TESTS_OTP_DICTS_OTP_MD5_C 1
+#include "otp-dicts.h"
 
 /////////////////
 //             //
diff --git a/lib/libotputil/ldict-rfc2289-md5.txt b/tests/otp-dicts/rfc2289-md5.txt
index 9f90c7d..9f90c7d 100644
--- a/lib/libotputil/ldict-rfc2289-md5.txt
+++ b/tests/otp-dicts/rfc2289-md5.txt
diff --git a/lib/libotputil/ldict-rfc2289-sha1.c b/tests/otp-dicts/rfc2289-sha1.c
index d6e7536..557f7f5 100644
--- a/lib/libotputil/ldict-rfc2289-sha1.c
+++ b/tests/otp-dicts/rfc2289-sha1.c
@@ -30,9 +30,8 @@
 /*
  *  @file lib/libotputil/libotputil.c
  */
-#define _LIB_LDICT_OTP_SHA1_C 1
-#include "libotputil.h"
-
+#define _TESTS_OTP_DICTS_OTP_SHA1_C 1
+#include "otp-dicts.h"
 
 /////////////////
 //             //
diff --git a/lib/libotputil/ldict-rfc2289-sha1.txt b/tests/otp-dicts/rfc2289-sha1.txt
index 3dd0141..3dd0141 100644
--- a/lib/libotputil/ldict-rfc2289-sha1.txt
+++ b/tests/otp-dicts/rfc2289-sha1.txt
diff --git a/tests/test-dict-otp.c b/tests/test-dict-otp.c
index e9e5794..bfc4530 100644
--- a/tests/test-dict-otp.c
+++ b/tests/test-dict-otp.c
@@ -54,6 +54,8 @@
 
 #include <otputil.h>
 
+#include "otp-dicts/otp-dicts.h"
+
 
 ///////////////////
 //               //
@@ -88,12 +90,6 @@
 
 static int verbose   = 0;
 static int quiet     = 0;
-extern const char * otputil_dict_otp_md4[];
-extern const char * otputil_dict_otp_md5[];
-extern const char * otputil_dict_otp_sha1[];
-extern const char * otputil_dict_rfc2289_md4[];
-extern const char * otputil_dict_rfc2289_md5[];
-extern const char * otputil_dict_rfc2289_sha1[];
 
 
 //////////////////