diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-01-10 12:26:41 -0500 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-01-10 15:20:57 -0500 |
| commit | ee914bf036b78dcbde9bf694794c15482d721028 (patch) | |
| tree | 13793fdc02dbf47bd4dd5e93861bccac71d58887 /openssl/apps/s_time.c | |
| parent | faa5026e540d03f858265b2796054d685f687383 (diff) | |
| download | vcxsrv-ee914bf036b78dcbde9bf694794c15482d721028.tar.gz vcxsrv-ee914bf036b78dcbde9bf694794c15482d721028.tar.bz2 vcxsrv-ee914bf036b78dcbde9bf694794c15482d721028.zip | |
Update openssl to version openssl-1.0.1k
Conflicts:
openssl/Makefile
Diffstat (limited to 'openssl/apps/s_time.c')
| -rw-r--r-- | openssl/apps/s_time.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/openssl/apps/s_time.c b/openssl/apps/s_time.c index b823c33c5..81dad5324 100644 --- a/openssl/apps/s_time.c +++ b/openssl/apps/s_time.c @@ -349,13 +349,7 @@ int MAIN(int argc, char **argv) if (bio_err == NULL) bio_err=BIO_new_fp(stderr,BIO_NOCLOSE); -#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3) s_time_meth=SSLv23_client_method(); -#elif !defined(OPENSSL_NO_SSL3) - s_time_meth=SSLv3_client_method(); -#elif !defined(OPENSSL_NO_SSL2) - s_time_meth=SSLv2_client_method(); -#endif /* parse the command line arguments */ if( parseArgs( argc, argv ) < 0 ) |