merge openssl-0.9.7-beta3, tested on vax by miod@

7 files changed, 8 insertions, 8 deletions

diff --git a/lib/libssl/src/demos/easy_tls/Makefile b/lib/libssl/src/demos/easy_tls/Makefile
index 32a79c4cc99..bec7e7265e0 100644
--- a/lib/libssl/src/demos/easy_tls/Makefile
+++ b/lib/libssl/src/demos/easy_tls/Makefile
@@ -1,5 +1,5 @@
 # Makefile for easy-tls example application (rudimentary client and server)
-# $Id: Makefile,v 1.2 2002/09/05 22:12:11 markus Exp $
+# $Id: Makefile,v 1.3 2002/09/10 16:31:56 markus Exp $
 
 SOLARIS_CFLAGS=-Wall -pedantic -g -O2
 SOLARIS_LIBS=-lxnet
diff --git a/lib/libssl/src/demos/easy_tls/cacerts.pem b/lib/libssl/src/demos/easy_tls/cacerts.pem
index 036e3c3dc0a..b6db7cf2bb3 100644
--- a/lib/libssl/src/demos/easy_tls/cacerts.pem
+++ b/lib/libssl/src/demos/easy_tls/cacerts.pem
@@ -1,4 +1,4 @@
-$Id: cacerts.pem,v 1.2 2002/09/05 22:12:11 markus Exp $
+$Id: cacerts.pem,v 1.3 2002/09/10 16:31:56 markus Exp $
 
 issuer= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test PCA (1024 bit)
 subject=/C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test CA (1024 bit)
diff --git a/lib/libssl/src/demos/easy_tls/cert.pem b/lib/libssl/src/demos/easy_tls/cert.pem
index ab38de65e78..3fcf302e2bb 100644
--- a/lib/libssl/src/demos/easy_tls/cert.pem
+++ b/lib/libssl/src/demos/easy_tls/cert.pem
@@ -1,4 +1,4 @@
-$Id: cert.pem,v 1.2 2002/09/05 22:12:11 markus Exp $
+$Id: cert.pem,v 1.3 2002/09/10 16:31:56 markus Exp $
 
 Example certificate and key.
 
diff --git a/lib/libssl/src/demos/easy_tls/easy-tls.c b/lib/libssl/src/demos/easy_tls/easy-tls.c
index 70f7ae3c11b..c958f4b609d 100644
--- a/lib/libssl/src/demos/easy_tls/easy-tls.c
+++ b/lib/libssl/src/demos/easy_tls/easy-tls.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; c-file-style: "bsd" -*- */
 /*
  * easy-tls.c -- generic TLS proxy.
- * $Id: easy-tls.c,v 1.2 2002/09/05 22:12:11 markus Exp $
+ * $Id: easy-tls.c,v 1.3 2002/09/10 16:31:56 markus Exp $
  */
 /*
  (c) Copyright 1999 Bodo Moeller.  All rights reserved.
@@ -73,7 +73,7 @@
  */
 
 static char const rcsid[] =
-"$Id: easy-tls.c,v 1.2 2002/09/05 22:12:11 markus Exp $";
+"$Id: easy-tls.c,v 1.3 2002/09/10 16:31:56 markus Exp $";
 
 #include <assert.h>
 #include <errno.h>
diff --git a/lib/libssl/src/demos/easy_tls/easy-tls.h b/lib/libssl/src/demos/easy_tls/easy-tls.h
index 31332004438..7ea26203c12 100644
--- a/lib/libssl/src/demos/easy_tls/easy-tls.h
+++ b/lib/libssl/src/demos/easy_tls/easy-tls.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; c-file-style: "bsd" -*- */
 /*
  * easy-tls.h -- generic TLS proxy.
- * $Id: easy-tls.h,v 1.2 2002/09/05 22:12:11 markus Exp $
+ * $Id: easy-tls.h,v 1.3 2002/09/10 16:31:56 markus Exp $
  */
 /*
  * (c) Copyright 1999 Bodo Moeller.  All rights reserved.
diff --git a/lib/libssl/src/demos/easy_tls/test.c b/lib/libssl/src/demos/easy_tls/test.c
index f86141d1d89..9b478c3fd8b 100644
--- a/lib/libssl/src/demos/easy_tls/test.c
+++ b/lib/libssl/src/demos/easy_tls/test.c
@@ -1,5 +1,5 @@
 /* test.c */
-/* $Id: test.c,v 1.2 2002/09/05 22:12:11 markus Exp $ */
+/* $Id: test.c,v 1.3 2002/09/10 16:31:56 markus Exp $ */
 
 #define L_PORT 9999
 #define C_PORT 443
diff --git a/lib/libssl/src/demos/easy_tls/test.h b/lib/libssl/src/demos/easy_tls/test.h
index 575391c00b7..b5792a0a811 100644
--- a/lib/libssl/src/demos/easy_tls/test.h
+++ b/lib/libssl/src/demos/easy_tls/test.h
@@ -1,5 +1,5 @@
 /* test.h */
-/* $Id: test.h,v 1.2 2002/09/05 22:12:11 markus Exp $ */
+/* $Id: test.h,v 1.3 2002/09/10 16:31:56 markus Exp $ */
 
 
 void test_process_init(int fd, int client_p, void *apparg);