Fix protocol downgrade bug in case of fragmented packets

[openssl.git] / apps / version.c

diff --git a/apps/version.c b/apps/version.c
index 6baf679b776497823ca3cfd7b150189c80097db0..e9555cbde29da0ebd07d6582c47e2c105a7ca808 100644 (file)
--- a/apps/version.c
+++ b/apps/version.c
@@ -115,6 +115,7 @@
 #include "apps.h"
 #include <openssl/evp.h>
 #include <openssl/crypto.h>
+#include <openssl/bn.h>
 #ifndef OPENSSL_NO_MD2
 # include <openssl/md2.h>
 #endif
@@ -122,7 +123,7 @@
 # include <openssl/rc4.h>
 #endif
 #ifndef OPENSSL_NO_DES
-# include <openssl/des_old.h>
+# include <openssl/des.h>
 #endif
 #ifndef OPENSSL_NO_IDEA
 # include <openssl/idea.h>
@@ -166,13 +167,25 @@ int MAIN(int argc, char **argv)
                        date=version=cflags=options=platform=dir=1;
                else
                        {
-                       BIO_printf(bio_err,"usage:version -[avbofp]\n");
+                       BIO_printf(bio_err,"usage:version -[avbofpd]\n");
                        ret=1;
                        goto end;
                        }
                }
 
-       if (version) printf("%s\n",SSLeay_version(SSLEAY_VERSION));
+       if (version)
+               {
+               if (SSLeay() == SSLEAY_VERSION_NUMBER)
+                       {
+                       printf("%s\n",SSLeay_version(SSLEAY_VERSION));
+                       }
+               else
+                       {
+                       printf("%s (Library: %s)\n",
+                               OPENSSL_VERSION_TEXT,
+                               SSLeay_version(SSLEAY_VERSION));
+                       }
+               }
        if (date)    printf("%s\n",SSLeay_version(SSLEAY_BUILT_ON));
        if (platform) printf("%s\n",SSLeay_version(SSLEAY_PLATFORM));
        if (options) 
@@ -186,7 +199,7 @@ int MAIN(int argc, char **argv)
                printf("%s ",RC4_options());
 #endif
 #ifndef OPENSSL_NO_DES
-               printf("%s ",des_options());
+               printf("%s ",DES_options());
 #endif
 #ifndef OPENSSL_NO_IDEA
                printf("%s ",idea_options());
@@ -200,5 +213,5 @@ int MAIN(int argc, char **argv)
        if (dir)  printf("%s\n",SSLeay_version(SSLEAY_DIR));
 end:
        apps_shutdown();
-       EXIT(ret);
+       OPENSSL_EXIT(ret);
        }