=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.c,v retrieving revision 1.540 retrieving revision 1.541 diff -u -r1.540 -r1.541 --- src/usr.bin/ssh/ssh.c 2020/10/18 11:32:02 1.540 +++ src/usr.bin/ssh/ssh.c 2020/11/08 11:46:12 1.541 @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.540 2020/10/18 11:32:02 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.541 2020/11/08 11:46:12 dtucker Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -867,13 +867,7 @@ break; case 'V': fprintf(stderr, "%s, %s\n", - SSH_VERSION, -#ifdef WITH_OPENSSL - OpenSSL_version(OPENSSL_VERSION) -#else - "without OpenSSL" -#endif - ); + SSH_VERSION, SSH_OPENSSL_VERSION); if (opt == 'V') exit(0); break; @@ -1139,13 +1133,7 @@ !use_syslog); if (debug_flag) - logit("%s, %s", SSH_VERSION, -#ifdef WITH_OPENSSL - OpenSSL_version(OPENSSL_VERSION) -#else - "without OpenSSL" -#endif - ); + logit("%s, %s", SSH_VERSION, SSH_OPENSSL_VERSION); /* Parse the configuration files */ process_config_files(host_arg, pw, 0, &want_final_pass);