From 81c63b0eed39432878f78727f60a1e7499645199 Mon Sep 17 00:00:00 2001
From: Yves-Alexis Perez <corsac@debian.org>
Date: Fri, 11 Jul 2014 07:23:31 +0200
Subject: Imported Upstream version 5.2.0

---
 src/scepclient/Android.mk   | 28 ++++++++++++++++++++++++++++
 src/scepclient/Makefile.am  |  1 +
 src/scepclient/Makefile.in  |  7 ++++++-
 src/scepclient/scepclient.c |  2 +-
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 src/scepclient/Android.mk

(limited to 'src/scepclient')

diff --git a/src/scepclient/Android.mk b/src/scepclient/Android.mk
new file mode 100644
index 000000000..bec3d77ff
--- /dev/null
+++ b/src/scepclient/Android.mk
@@ -0,0 +1,28 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+# copy-n-paste from Makefile.am
+scepclient_SOURCES := \
+scepclient.c scep.c scep.h
+
+LOCAL_SRC_FILES := $(filter %.c,$(scepclient_SOURCES))
+
+# build scepclient -------------------------------------------------------------
+
+LOCAL_C_INCLUDES += \
+	$(strongswan_PATH)/src/libstrongswan
+
+LOCAL_CFLAGS := $(strongswan_CFLAGS) \
+	-DPLUGINS='"$(strongswan_SCEPCLIENT_PLUGINS)"'
+
+LOCAL_MODULE := scepclient
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_ARM_MODE := arm
+
+LOCAL_PRELINK_MODULE := false
+
+LOCAL_SHARED_LIBRARIES += libstrongswan
+
+include $(BUILD_EXECUTABLE)
\ No newline at end of file
diff --git a/src/scepclient/Makefile.am b/src/scepclient/Makefile.am
index c911be1c4..b3beb1b68 100644
--- a/src/scepclient/Makefile.am
+++ b/src/scepclient/Makefile.am
@@ -14,3 +14,4 @@ scepclient_LDADD = \
 $(top_builddir)/src/libstrongswan/libstrongswan.la
 
 dist_man_MANS = scepclient.8
+EXTRA_DIST = Android.mk
diff --git a/src/scepclient/Makefile.in b/src/scepclient/Makefile.in
index 524e05bd7..27a6b8220 100644
--- a/src/scepclient/Makefile.in
+++ b/src/scepclient/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -262,6 +262,7 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENSSL_LIB = @OPENSSL_LIB@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -280,6 +281,7 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGIN_CFLAGS = @PLUGIN_CFLAGS@
 PTHREADLIB = @PTHREADLIB@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
@@ -307,6 +309,7 @@ abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+aikgen_plugins = @aikgen_plugins@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -398,6 +401,7 @@ srcdir = @srcdir@
 starter_plugins = @starter_plugins@
 strongswan_conf = @strongswan_conf@
 strongswan_options = @strongswan_options@
+swanctldir = @swanctldir@
 sysconfdir = @sysconfdir@
 systemdsystemunitdir = @systemdsystemunitdir@
 t_plugins = @t_plugins@
@@ -421,6 +425,7 @@ scepclient_LDADD = \
 $(top_builddir)/src/libstrongswan/libstrongswan.la
 
 dist_man_MANS = scepclient.8
+EXTRA_DIST = Android.mk
 all: all-am
 
 .SUFFIXES:
diff --git a/src/scepclient/scepclient.c b/src/scepclient/scepclient.c
index d7abcb423..853490f61 100644
--- a/src/scepclient/scepclient.c
+++ b/src/scepclient/scepclient.c
@@ -896,7 +896,7 @@ int main(int argc, char **argv)
 					}
 					hash = hasher_algorithm_from_integrity(token->algorithm,
 														   NULL);
-					if (hash == OID_UNKNOWN)
+					if (hash == (hash_algorithm_t)OID_UNKNOWN)
 					{
 						usage("invalid algorithm specified");
 					}
-- 
cgit v1.2.3