kill some more VMS ifdefs

ok miod@

diff --git a/lib/libcrypto/ec/ecp_nistp224.c b/lib/libcrypto/ec/ecp_nistp224.c
index 057670c..7593b3c 100644 (file)
--- a/lib/libcrypto/ec/ecp_nistp224.c
+++ b/lib/libcrypto/ec/ecp_nistp224.c
@@ -28,11 +28,7 @@
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
 
-#ifndef OPENSSL_SYS_VMS
 #include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
 
 #include <string.h>
 #include <openssl/err.h>

diff --git a/lib/libcrypto/ec/ecp_nistp256.c b/lib/libcrypto/ec/ecp_nistp256.c
index 345f67d..1ff63bb 100644 (file)
--- a/lib/libcrypto/ec/ecp_nistp256.c
+++ b/lib/libcrypto/ec/ecp_nistp256.c
@@ -29,11 +29,7 @@
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
 
-#ifndef OPENSSL_SYS_VMS
 #include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
 
 #include <string.h>
 #include <openssl/err.h>

diff --git a/lib/libcrypto/ec/ecp_nistp521.c b/lib/libcrypto/ec/ecp_nistp521.c
index f5b72a4..53a10aa 100644 (file)
--- a/lib/libcrypto/ec/ecp_nistp521.c
+++ b/lib/libcrypto/ec/ecp_nistp521.c
@@ -29,11 +29,7 @@
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
 
-#ifndef OPENSSL_SYS_VMS
 #include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
 
 #include <string.h>
 #include <openssl/err.h>

diff --git a/lib/libcrypto/engine/eng_list.c b/lib/libcrypto/engine/eng_list.c
index 5528b54..b51557b 100644 (file)
--- a/lib/libcrypto/engine/eng_list.c
+++ b/lib/libcrypto/engine/eng_list.c
@@ -398,11 +398,7 @@ ENGINE *ENGINE_by_id(const char *id)
        /* Prevent infinite recusrion if we're looking for the dynamic engine. */
        if (strcmp(id, "dynamic"))
                {
-#ifdef OPENSSL_SYS_VMS
-               if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = "SSLROOT:[ENGINES]";
-#else
                if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = ENGINESDIR;
-#endif
                iterator = ENGINE_by_id("dynamic");
                if(!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) ||
                                !ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) ||

diff --git a/lib/libssl/src/crypto/ec/ecp_nistp224.c b/lib/libssl/src/crypto/ec/ecp_nistp224.c
index 057670c..7593b3c 100644 (file)
--- a/lib/libssl/src/crypto/ec/ecp_nistp224.c
+++ b/lib/libssl/src/crypto/ec/ecp_nistp224.c
@@ -28,11 +28,7 @@
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
 
-#ifndef OPENSSL_SYS_VMS
 #include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
 
 #include <string.h>
 #include <openssl/err.h>

diff --git a/lib/libssl/src/crypto/ec/ecp_nistp256.c b/lib/libssl/src/crypto/ec/ecp_nistp256.c
index 345f67d..1ff63bb 100644 (file)
--- a/lib/libssl/src/crypto/ec/ecp_nistp256.c
+++ b/lib/libssl/src/crypto/ec/ecp_nistp256.c
@@ -29,11 +29,7 @@
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
 
-#ifndef OPENSSL_SYS_VMS
 #include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
 
 #include <string.h>
 #include <openssl/err.h>

diff --git a/lib/libssl/src/crypto/ec/ecp_nistp521.c b/lib/libssl/src/crypto/ec/ecp_nistp521.c
index f5b72a4..53a10aa 100644 (file)
--- a/lib/libssl/src/crypto/ec/ecp_nistp521.c
+++ b/lib/libssl/src/crypto/ec/ecp_nistp521.c
@@ -29,11 +29,7 @@
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
 
-#ifndef OPENSSL_SYS_VMS
 #include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
 
 #include <string.h>
 #include <openssl/err.h>

diff --git a/lib/libssl/src/crypto/engine/eng_list.c b/lib/libssl/src/crypto/engine/eng_list.c
index 5528b54..b51557b 100644 (file)
--- a/lib/libssl/src/crypto/engine/eng_list.c
+++ b/lib/libssl/src/crypto/engine/eng_list.c
@@ -398,11 +398,7 @@ ENGINE *ENGINE_by_id(const char *id)
        /* Prevent infinite recusrion if we're looking for the dynamic engine. */
        if (strcmp(id, "dynamic"))
                {
-#ifdef OPENSSL_SYS_VMS
-               if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = "SSLROOT:[ENGINES]";
-#else
                if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = ENGINESDIR;
-#endif
                iterator = ENGINE_by_id("dynamic");
                if(!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) ||
                                !ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) ||