From b401bc1d517a70176585470c67ef17089d4614387d212923ddec0aed65e28522 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Mon, 9 Mar 2015 09:02:18 +0000
Subject: [PATCH] - Applied a fix by Marcus Meissner for a loop check in ipsec
 pki   causing a segfault on attempt to create certificates when fips   is
 enabled (bsc#918474,https://wiki.strongswan.org/issues/881)   [+
 0006-strongswan-pkifix.918474.patch]

OBS-URL: https://build.opensuse.org/package/show/network:vpn/strongswan?expand=0&rev=88
---
 0007-strongswan-pkifix.918474.patch | 16 ++++++++++++++++
 strongswan.changes                  |  8 ++++++++
 strongswan.spec                     |  4 +++-
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 0007-strongswan-pkifix.918474.patch

diff --git a/0007-strongswan-pkifix.918474.patch b/0007-strongswan-pkifix.918474.patch
new file mode 100644
index 0000000..b85d0f1
--- /dev/null
+++ b/0007-strongswan-pkifix.918474.patch
@@ -0,0 +1,16 @@
+References: bsc#918474,https://wiki.strongswan.org/issues/881
+Upstream: yes
+
+Index: strongswan-5.1.3/src/pki/command.c
+===================================================================
+--- strongswan-5.1.3.orig/src/pki/command.c
++++ strongswan-5.1.3/src/pki/command.c
+@@ -73,7 +73,7 @@ static void build_opts()
+ 	memset(command_optstring, 0, sizeof(command_optstring));
+ 	if (active == help_idx)
+ 	{
+-		for (i = 0; cmds[i].cmd; i++)
++		for (i = 0; i < MAX_COMMANDS && cmds[i].cmd; i++)
+ 		{
+ 			command_opts[i].name = cmds[i].cmd;
+ 			command_opts[i].val = cmds[i].op;
diff --git a/strongswan.changes b/strongswan.changes
index 84ad58f..e96000a 100644
--- a/strongswan.changes
+++ b/strongswan.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Mar  9 08:37:42 UTC 2015 - mt@suse.de
+
+- Applied a fix by Marcus Meissner for a loop check in ipsec pki
+  causing a segfault on attempt to create certificates when fips
+  is enabled (bsc#918474,https://wiki.strongswan.org/issues/881)
+  [+ 0006-strongswan-pkifix.918474.patch]
+
 -------------------------------------------------------------------
 Mon Jan  5 14:38:46 UTC 2015 - mt@suse.de
 
diff --git a/strongswan.spec b/strongswan.spec
index 7e6acc0..d991798 100644
--- a/strongswan.spec
+++ b/strongswan.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package strongswan
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -82,6 +82,7 @@ Patch2:         %{name}_ipsec_service.patch
 Patch3:         %{name}_fipscheck.patch
 Patch4:         %{name}_fipsfilter.patch
 %endif
+Patch7:         0007-strongswan-pkifix.918474.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  curl-devel
@@ -291,6 +292,7 @@ and the load testing plugin for IKEv2 daemon.
 %if %{with fipscheck}
 %patch3 -p0
 %patch4 -p1
+%patch7 -p1
 %endif
 sed -e 's|@libexecdir@|%_libexecdir|g'    \
      < $RPM_SOURCE_DIR/strongswan.init.in \