[svn-upgrade] Integrating new upstream version, strongswan (4.1.10)

4 files changed, 14 insertions, 14 deletions

diff --git a/src/libstrongswan/crypto/ac.c b/src/libstrongswan/crypto/ac.c
index 1367494f8..641ce5d64 100644
--- a/src/libstrongswan/crypto/ac.c
+++ b/src/libstrongswan/crypto/ac.c
@@ -20,7 +20,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: ac.c 3300 2007-10-12 21:53:18Z andreas $
+ * RCSID $Id: ac.c 3355 2007-11-20 12:06:40Z martin $
  */
 
 #include <string.h>
@@ -544,7 +544,7 @@ static void list(const private_x509ac_t *this, FILE *out, bool utc)
 	fprintf(out, "    validity:   not before %#T, ", &this->notBefore, utc);
 	if (now < this->notBefore)
 	{
-		fprintf(out, "not valid yet (valid in %V)\n", &now, &this->notBefore);
+		fprintf(out, "not valid yet (valid in %#V)\n", &now, &this->notBefore);
 	}
 	else
 	{
@@ -554,14 +554,14 @@ static void list(const private_x509ac_t *this, FILE *out, bool utc)
 	fprintf(out, "                not after  %#T, ", &this->notAfter, utc);
 	if (now > this->notAfter)
 	{
-		fprintf(out, "expired (%V ago)\n", &now, &this->notAfter);
+		fprintf(out, "expired (%#V ago)\n", &now, &this->notAfter);
 	}
 	else
 	{
 		fprintf(out, "ok");
 		if (now > this->notAfter - ACERT_WARNING_INTERVAL * 60 * 60 * 24)
 		{
-			fprintf(out, " (expires in %V)", &now, &this->notAfter);
+			fprintf(out, " (expires in %#V)", &now, &this->notAfter);
 		}
 		fprintf(out, " \n");
 	}
diff --git a/src/libstrongswan/crypto/ca.c b/src/libstrongswan/crypto/ca.c
index a78590954..510e3528e 100644
--- a/src/libstrongswan/crypto/ca.c
+++ b/src/libstrongswan/crypto/ca.c
@@ -279,11 +279,11 @@ static void list_certinfos(private_ca_info_t *this, FILE *out, bool utc)
 		fprintf(out, "%#T, until %#T, ", &thisUpdate, utc, &nextUpdate, utc);
 		if (now > nextUpdate)
 		{
-			fprintf(out, "expired (%V ago)\n", &now, &nextUpdate);
+			fprintf(out, "expired (%#V ago)\n", &now, &nextUpdate);
 		}
 		else
 		{
-			fprintf(out, "ok (expires in %V)\n", &now, &nextUpdate);
+			fprintf(out, "ok (expires in %#V)\n", &now, &nextUpdate);
 		}
 		fprintf(out, "    serial:     %#B, %N\n", &serial,
 				cert_status_names, certinfo->get_status(certinfo));
@@ -654,7 +654,7 @@ static cert_status_t verify_by_ocsp(private_ca_info_t* this,
 
 				if (comparison > 0)
 				{
-					iterator->insert_after(iterator, (void *)cached_certinfo);
+					this->certinfos->insert_last(this->certinfos, (void *)cached_certinfo);
 				}
 				else
 				{
diff --git a/src/libstrongswan/crypto/crl.c b/src/libstrongswan/crypto/crl.c
index d52078ea9..ab23bb9ec 100755
--- a/src/libstrongswan/crypto/crl.c
+++ b/src/libstrongswan/crypto/crl.c
@@ -19,7 +19,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: crl.c 3300 2007-10-12 21:53:18Z andreas $
+ * RCSID $Id: crl.c 3355 2007-11-20 12:06:40Z martin $
  */
 
 #include <sys/stat.h>
@@ -463,11 +463,11 @@ static void list(private_crl_t *this, FILE* out, bool utc)
 	}
 	else if (now > this->nextUpdate)
 	{
-		fprintf(out, "expired (%V ago)\n", &now, &this->nextUpdate);
+		fprintf(out, "expired (%#V ago)\n", &now, &this->nextUpdate);
 	}
 	else if (now > this->nextUpdate - CRL_WARNING_INTERVAL * 60 * 60 * 24)
 	{
-		fprintf(out, "ok (expires in %V)\n", &now, &this->nextUpdate);
+		fprintf(out, "ok (expires in %#V)\n", &now, &this->nextUpdate);
 	}
 	else
 	{
diff --git a/src/libstrongswan/crypto/x509.c b/src/libstrongswan/crypto/x509.c
index d9093fc62..6f154b36f 100755
--- a/src/libstrongswan/crypto/x509.c
+++ b/src/libstrongswan/crypto/x509.c
@@ -24,7 +24,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: x509.c 3301 2007-10-12 21:56:30Z andreas $
+ * RCSID $Id: x509.c 3355 2007-11-20 12:06:40Z martin $
  */
 
 #include <gmp.h>
@@ -1182,7 +1182,7 @@ static void list(private_x509_t *this, FILE *out, bool utc)
 	fprintf(out, "    validity:   not before %#T, ", &this->notBefore, utc);
 	if (now < this->notBefore)
 	{
-		fprintf(out, "not valid yet (valid in %V)\n", &now, &this->notBefore);
+		fprintf(out, "not valid yet (valid in %#V)\n", &now, &this->notBefore);
 	}
 	else
 	{
@@ -1192,14 +1192,14 @@ static void list(private_x509_t *this, FILE *out, bool utc)
 	fprintf(out, "                not after  %#T, ", &this->notAfter, utc);
 	if (now > this->notAfter)
 	{
-		fprintf(out, "expired (%V ago)\n", &now, &this->notAfter);
+		fprintf(out, "expired (%#V ago)\n", &now, &this->notAfter);
 	}
 	else
 	{
 		fprintf(out, "ok");
 		if (now > this->notAfter - CERT_WARNING_INTERVAL * 60 * 60 * 24)
 		{
-			fprintf(out, " (expires in %V)", &now, &this->notAfter);
+			fprintf(out, " (expires in %#V)", &now, &this->notAfter);
 		}
 		fprintf(out, " \n");
 	}