From e83b8190d46352f8a625491b10af19c8b0ac2def Mon Sep 17 00:00:00 2001
From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Sat, 15 Oct 2005 05:07:29 +0000
Subject: Enable the use of --ca together with --pkcs12.  If --ca is used at
 the same time as --pkcs12, the CA certificate is loaded from the file
 specified by --ca regardless if the pkcs12 file contains a CA cert or not
 (Mathias Sundman). Pre-2.1-beta3

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@612 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 0658da6..aa03feb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@ $Id$
 2005.10.xx -- Version 2.1-beta3
 
 * Added PKCS#11 support (Alon Bar-Lev).
+* Enable the use of --ca together with --pkcs12.  If --ca is
+  used at the same time as --pkcs12, the CA certificate is loaded
+  from the file specified by --ca regardless if the pkcs12 file
+  contains a CA cert or not (Mathias Sundman).
 * NOTE TO PACKAGE MAINTAINERS: Moved "plugin"
   directory to "plugins".  This is
   to work around a strange problem with the
-- 
cgit v1.2.3