diff options
| author |   djm <djm@openbsd.org> | 2008-09-06 12:17:47 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2008-09-06 12:17:47 +0000 |
| commit | 4fcf65c5c59fcf6124cf9f1fd81aa546850f974c (patch) | |
| tree | 3c0b4c46d91bcb87c8eef7a1e84711159b17f71b /lib/libssl/src/demos | |
| parent | import of OpenSSL 0.9.8h (diff) | |
| download | wireguard-openbsd-4fcf65c5c59fcf6124cf9f1fd81aa546850f974c.tar.xz wireguard-openbsd-4fcf65c5c59fcf6124cf9f1fd81aa546850f974c.zip | |
resolve conflicts
Diffstat (limited to 'lib/libssl/src/demos')
| -rw-r--r-- | lib/libssl/src/demos/easy_tls/easy-tls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/src/demos/easy_tls/easy-tls.c b/lib/libssl/src/demos/easy_tls/easy-tls.c index c958f4b609d..b4c9f9e77bc 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.3 2002/09/10 16:31:56 markus Exp $ + * $Id: easy-tls.c,v 1.4 2008/09/06 12:17:52 djm Exp $ */ /* (c) Copyright 1999 Bodo Moeller. All rights reserved. @@ -73,7 +73,7 @@ */ static char const rcsid[] = -"$Id: easy-tls.c,v 1.3 2002/09/10 16:31:56 markus Exp $"; +"$Id: easy-tls.c,v 1.4 2008/09/06 12:17:52 djm Exp $"; #include <assert.h> #include <errno.h> |