diff options
| author | giovanni <> | 2014-05-08 12:59:17 +0000 |
|---|---|---|
| committer | giovanni <> | 2014-05-08 12:59:17 +0000 |
| commit | f7d9a959949e5f3918c1cf2b27fb4cd7b62d07d5 (patch) | |
| tree | eef630f451607fc89deab67c65b8530a091a4220 /src | |
| parent | 55b870bc0442258199f29518a1c056569c6cff35 (diff) | |
| download | openbsd-f7d9a959949e5f3918c1cf2b27fb4cd7b62d07d5.tar.gz openbsd-f7d9a959949e5f3918c1cf2b27fb4cd7b62d07d5.tar.bz2 openbsd-f7d9a959949e5f3918c1cf2b27fb4cd7b62d07d5.zip | |
kill some more VMS ifdefs
ok miod@
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/ec/ecp_nistp224.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/ec/ecp_nistp256.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/ec/ecp_nistp521.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/engine/eng_list.c | 4 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/ec/ecp_nistp224.c | 4 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/ec/ecp_nistp256.c | 4 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/ec/ecp_nistp521.c | 4 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/engine/eng_list.c | 4 |
8 files changed, 0 insertions, 32 deletions
diff --git a/src/lib/libcrypto/ec/ecp_nistp224.c b/src/lib/libcrypto/ec/ecp_nistp224.c index 057670cf04..7593b3c440 100644 --- a/src/lib/libcrypto/ec/ecp_nistp224.c +++ b/src/lib/libcrypto/ec/ecp_nistp224.c | |||
| @@ -28,11 +28,7 @@ | |||
| 28 | #include <openssl/opensslconf.h> | 28 | #include <openssl/opensslconf.h> |
| 29 | #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 | 29 | #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 |
| 30 | 30 | ||
| 31 | #ifndef OPENSSL_SYS_VMS | ||
| 32 | #include <stdint.h> | 31 | #include <stdint.h> |
| 33 | #else | ||
| 34 | #include <inttypes.h> | ||
| 35 | #endif | ||
| 36 | 32 | ||
| 37 | #include <string.h> | 33 | #include <string.h> |
| 38 | #include <openssl/err.h> | 34 | #include <openssl/err.h> |
diff --git a/src/lib/libcrypto/ec/ecp_nistp256.c b/src/lib/libcrypto/ec/ecp_nistp256.c index 345f67d520..1ff63bbbcc 100644 --- a/src/lib/libcrypto/ec/ecp_nistp256.c +++ b/src/lib/libcrypto/ec/ecp_nistp256.c | |||
| @@ -29,11 +29,7 @@ | |||
| 29 | #include <openssl/opensslconf.h> | 29 | #include <openssl/opensslconf.h> |
| 30 | #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 | 30 | #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 |
| 31 | 31 | ||
| 32 | #ifndef OPENSSL_SYS_VMS | ||
| 33 | #include <stdint.h> | 32 | #include <stdint.h> |
| 34 | #else | ||
| 35 | #include <inttypes.h> | ||
| 36 | #endif | ||
| 37 | 33 | ||
| 38 | #include <string.h> | 34 | #include <string.h> |
| 39 | #include <openssl/err.h> | 35 | #include <openssl/err.h> |
diff --git a/src/lib/libcrypto/ec/ecp_nistp521.c b/src/lib/libcrypto/ec/ecp_nistp521.c index f5b72a4c0d..53a10aa1b9 100644 --- a/src/lib/libcrypto/ec/ecp_nistp521.c +++ b/src/lib/libcrypto/ec/ecp_nistp521.c | |||
| @@ -29,11 +29,7 @@ | |||
| 29 | #include <openssl/opensslconf.h> | 29 | #include <openssl/opensslconf.h> |
| 30 | #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 | 30 | #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 |
| 31 | 31 | ||
| 32 | #ifndef OPENSSL_SYS_VMS | ||
| 33 | #include <stdint.h> | 32 | #include <stdint.h> |
| 34 | #else | ||
| 35 | #include <inttypes.h> | ||
| 36 | #endif | ||
| 37 | 33 | ||
| 38 | #include <string.h> | 34 | #include <string.h> |
| 39 | #include <openssl/err.h> | 35 | #include <openssl/err.h> |
diff --git a/src/lib/libcrypto/engine/eng_list.c b/src/lib/libcrypto/engine/eng_list.c index 5528b5478f..b51557bbd8 100644 --- a/src/lib/libcrypto/engine/eng_list.c +++ b/src/lib/libcrypto/engine/eng_list.c | |||
| @@ -398,11 +398,7 @@ ENGINE *ENGINE_by_id(const char *id) | |||
| 398 | /* Prevent infinite recusrion if we're looking for the dynamic engine. */ | 398 | /* Prevent infinite recusrion if we're looking for the dynamic engine. */ |
| 399 | if (strcmp(id, "dynamic")) | 399 | if (strcmp(id, "dynamic")) |
| 400 | { | 400 | { |
| 401 | #ifdef OPENSSL_SYS_VMS | ||
| 402 | if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = "SSLROOT:[ENGINES]"; | ||
| 403 | #else | ||
| 404 | if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = ENGINESDIR; | 401 | if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = ENGINESDIR; |
| 405 | #endif | ||
| 406 | iterator = ENGINE_by_id("dynamic"); | 402 | iterator = ENGINE_by_id("dynamic"); |
| 407 | if(!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) || | 403 | if(!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) || |
| 408 | !ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) || | 404 | !ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) || |
diff --git a/src/lib/libssl/src/crypto/ec/ecp_nistp224.c b/src/lib/libssl/src/crypto/ec/ecp_nistp224.c index 057670cf04..7593b3c440 100644 --- a/src/lib/libssl/src/crypto/ec/ecp_nistp224.c +++ b/src/lib/libssl/src/crypto/ec/ecp_nistp224.c | |||
| @@ -28,11 +28,7 @@ | |||
| 28 | #include <openssl/opensslconf.h> | 28 | #include <openssl/opensslconf.h> |
| 29 | #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 | 29 | #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 |
| 30 | 30 | ||
| 31 | #ifndef OPENSSL_SYS_VMS | ||
| 32 | #include <stdint.h> | 31 | #include <stdint.h> |
| 33 | #else | ||
| 34 | #include <inttypes.h> | ||
| 35 | #endif | ||
| 36 | 32 | ||
| 37 | #include <string.h> | 33 | #include <string.h> |
| 38 | #include <openssl/err.h> | 34 | #include <openssl/err.h> |
diff --git a/src/lib/libssl/src/crypto/ec/ecp_nistp256.c b/src/lib/libssl/src/crypto/ec/ecp_nistp256.c index 345f67d520..1ff63bbbcc 100644 --- a/src/lib/libssl/src/crypto/ec/ecp_nistp256.c +++ b/src/lib/libssl/src/crypto/ec/ecp_nistp256.c | |||
| @@ -29,11 +29,7 @@ | |||
| 29 | #include <openssl/opensslconf.h> | 29 | #include <openssl/opensslconf.h> |
| 30 | #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 | 30 | #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 |
| 31 | 31 | ||
| 32 | #ifndef OPENSSL_SYS_VMS | ||
| 33 | #include <stdint.h> | 32 | #include <stdint.h> |
| 34 | #else | ||
| 35 | #include <inttypes.h> | ||
| 36 | #endif | ||
| 37 | 33 | ||
| 38 | #include <string.h> | 34 | #include <string.h> |
| 39 | #include <openssl/err.h> | 35 | #include <openssl/err.h> |
diff --git a/src/lib/libssl/src/crypto/ec/ecp_nistp521.c b/src/lib/libssl/src/crypto/ec/ecp_nistp521.c index f5b72a4c0d..53a10aa1b9 100644 --- a/src/lib/libssl/src/crypto/ec/ecp_nistp521.c +++ b/src/lib/libssl/src/crypto/ec/ecp_nistp521.c | |||
| @@ -29,11 +29,7 @@ | |||
| 29 | #include <openssl/opensslconf.h> | 29 | #include <openssl/opensslconf.h> |
| 30 | #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 | 30 | #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 |
| 31 | 31 | ||
| 32 | #ifndef OPENSSL_SYS_VMS | ||
| 33 | #include <stdint.h> | 32 | #include <stdint.h> |
| 34 | #else | ||
| 35 | #include <inttypes.h> | ||
| 36 | #endif | ||
| 37 | 33 | ||
| 38 | #include <string.h> | 34 | #include <string.h> |
| 39 | #include <openssl/err.h> | 35 | #include <openssl/err.h> |
diff --git a/src/lib/libssl/src/crypto/engine/eng_list.c b/src/lib/libssl/src/crypto/engine/eng_list.c index 5528b5478f..b51557bbd8 100644 --- a/src/lib/libssl/src/crypto/engine/eng_list.c +++ b/src/lib/libssl/src/crypto/engine/eng_list.c | |||
| @@ -398,11 +398,7 @@ ENGINE *ENGINE_by_id(const char *id) | |||
| 398 | /* Prevent infinite recusrion if we're looking for the dynamic engine. */ | 398 | /* Prevent infinite recusrion if we're looking for the dynamic engine. */ |
| 399 | if (strcmp(id, "dynamic")) | 399 | if (strcmp(id, "dynamic")) |
| 400 | { | 400 | { |
| 401 | #ifdef OPENSSL_SYS_VMS | ||
| 402 | if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = "SSLROOT:[ENGINES]"; | ||
| 403 | #else | ||
| 404 | if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = ENGINESDIR; | 401 | if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = ENGINESDIR; |
| 405 | #endif | ||
| 406 | iterator = ENGINE_by_id("dynamic"); | 402 | iterator = ENGINE_by_id("dynamic"); |
| 407 | if(!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) || | 403 | if(!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) || |
| 408 | !ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) || | 404 | !ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) || |