split out some stuff to ykpers_lcl.h

diff --git a/Makefile.am b/Makefile.am
index febf69739e02594a96002ae9a56c91f6fb1b83d2..88d6249cf364d8a15698a71aa304883bde136b85 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,7 @@ ykpers_include_HEADERS += ykcore/ykstatus.h ykcore/ykcore.h ykcore/ykdef.h
 ykpers_include_HEADERS += ykpbkdf2.h
 
 lib_LTLIBRARIES = libykpers-1.la
-libykpers_1_la_SOURCES = ykpers.c ykpers-version.c ykpbkdf2.c
+libykpers_1_la_SOURCES = ykpers.c ykpers-version.c ykpbkdf2.c ykpers_lcl.h
 libykpers_1_la_SOURCES += rfc4634/hmac.c rfc4634/usha.c rfc4634/sha.h  \
        rfc4634/sha1.c rfc4634/sha224-256.c rfc4634/sha384-512.c        \
        rfc4634/sha-private.h

diff --git a/ykpers.c b/ykpers.c
index be9d5d314594492e050c43d379bc02c2dd22cb6d..1ca50db39284a215e74aa7a83579bb2d3587c74e 100644 (file)
--- a/ykpers.c
+++ b/ykpers.c
@@ -28,7 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ykcore_lcl.h"
+#include "ykpers_lcl.h"
 #include "ykpbkdf2.h"
 #include "yktsd.h"
 
@@ -42,15 +42,6 @@
 
 #include <yubikey.h>
 
-struct ykp_config_t {
-       unsigned int yk_major_version;
-       unsigned int yk_minor_version;
-       unsigned int yk_build_version;
-       unsigned int command;
-
-       YK_CONFIG ykcore_config;
-};
-
 static const YK_CONFIG default_config1 = {
        { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* fixed */
        { 0, 0, 0, 0, 0, 0 },   /* uid */

diff --git a/ykpers_lcl.h b/ykpers_lcl.h
new file mode 100644 (file)
index 0000000..908cfbd
--- /dev/null
+++ b/ykpers_lcl.h
@@ -0,0 +1,45 @@
+/* -*- mode:C; c-file-style: "bsd" -*- */
+/*
+ * Copyright (c) 2013 Yubico AB
+ * All rights reserved.
+ *
+ * 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.
+ *
+ * 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 THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS 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.
+ */
+
+#ifndef        __YKPERS_LCL_H_INCLUDED__
+#define        __YKPERS_LCL_H_INCLUDED__
+
+#include "ykcore_lcl.h"
+
+struct ykp_config_t {
+       unsigned int yk_major_version;
+       unsigned int yk_minor_version;
+       unsigned int yk_build_version;
+       unsigned int command;
+
+       YK_CONFIG ykcore_config;
+};
+
+#endif /* __YKPERS_LCL_H_INCLUDED__ */