summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/s_time.c
diff options
context:
space:
mode:
authordoug <>2015-02-08 10:22:45 +0000
committerdoug <>2015-02-08 10:22:45 +0000
commitf5656e5948afd96eceeae5f83939965ba96edc28 (patch)
treeba58b46fda227cb1089ceb084bb49a3366291f24 /src/usr.bin/openssl/s_time.c
parent653ed322d15a6087960710834e7221c7ff8b0af1 (diff)
downloadopenbsd-f5656e5948afd96eceeae5f83939965ba96edc28.tar.gz
openbsd-f5656e5948afd96eceeae5f83939965ba96edc28.tar.bz2
openbsd-f5656e5948afd96eceeae5f83939965ba96edc28.zip
Delete commented out code from openssl(1) apps.
From OpenSSL commits: 6f91b017bbb7140f816721141ac156d1b828a6b3 75d0ebef2aef7a2c77b27575b8da898e22f3ccd5 a2b18e657ea1a932d125154f4e13ab2258796d90 ok miod@, jsing@
Diffstat (limited to 'src/usr.bin/openssl/s_time.c')
-rw-r--r--src/usr.bin/openssl/s_time.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/src/usr.bin/openssl/s_time.c b/src/usr.bin/openssl/s_time.c
index fdbf1385a1..89f0d6becc 100644
--- a/src/usr.bin/openssl/s_time.c
+++ b/src/usr.bin/openssl/s_time.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s_time.c,v 1.3 2014/11/04 18:15:22 deraadt Exp $ */ 1/* $OpenBSD: s_time.c,v 1.4 2015/02/08 10:22:45 doug Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -198,17 +198,6 @@ parseArgs(int argc, char **argv)
198 goto bad; 198 goto bad;
199 host = *(++argv); 199 host = *(++argv);
200 } 200 }
201#if 0
202 else if (strcmp(*argv, "-host") == 0) {
203 if (--argc < 1)
204 goto bad;
205 host = *(++argv);
206 } else if (strcmp(*argv, "-port") == 0) {
207 if (--argc < 1)
208 goto bad;
209 port = *(++argv);
210 }
211#endif
212 else if (strcmp(*argv, "-reuse") == 0) 201 else if (strcmp(*argv, "-reuse") == 0)
213 perform = 2; 202 perform = 2;
214 else if (strcmp(*argv, "-new") == 0) 203 else if (strcmp(*argv, "-new") == 0)
@@ -551,11 +540,6 @@ doConnection(SSL * scon)
551 540
552 SSL_set_bio(serverCon, conn, conn); 541 SSL_set_bio(serverCon, conn, conn);
553 542
554#if 0
555 if (scon != NULL)
556 SSL_set_session(serverCon, SSL_get_session(scon));
557#endif
558
559 /* ok, lets connect */ 543 /* ok, lets connect */
560 for (;;) { 544 for (;;) {
561 i = SSL_connect(serverCon); 545 i = SSL_connect(serverCon);