moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

openssl: VMS support for SHA256

Browse Source 
setup-vms.h: More symbols for SHA256, hacks for older VAX

openssl.h: Use OpenSSL OPENSSL_NO_SHA256 macro to allow building on VAX.

openssl.c: Use OpenSSL version checks and OPENSSL_NO_SHA256 macro to
allow building on VAX and 64 bit VMS.
This commit is contained in:
John Malmberg 2015-07-01 20:54:09 -05:00 committed by Jay Satiro
parent 8f0178a56b
commit 79416fb2d6
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/setup-vms.h
View File

@ -249,7 +249,9 @@ char * unix_path;
#define MD5_Init MD5_INIT #define MD5_Init MD5_INIT
#define MD5_Update MD5_UPDATE #define MD5_Update MD5_UPDATE
#define OPENSSL_add_all_algo_noconf OPENSSL_ADD_ALL_ALGO_NOCONF #define OPENSSL_add_all_algo_noconf OPENSSL_ADD_ALL_ALGO_NOCONF
#ifndef __VAX
#define OPENSSL_load_builtin_modules OPENSSL_LOAD_BUILTIN_MODULES #define OPENSSL_load_builtin_modules OPENSSL_LOAD_BUILTIN_MODULES
#endif
#define PEM_read_X509 PEM_READ_X509 #define PEM_read_X509 PEM_READ_X509
#define PEM_write_bio_X509 PEM_WRITE_BIO_X509 #define PEM_write_bio_X509 PEM_WRITE_BIO_X509
#define PKCS12_PBE_add PKCS12_PBE_ADD #define PKCS12_PBE_add PKCS12_PBE_ADD
@ -353,6 +355,12 @@ char * unix_path;
#define sk_pop SK_POP #define sk_pop SK_POP
#define sk_pop_free SK_POP_FREE #define sk_pop_free SK_POP_FREE
#define sk_value SK_VALUE #define sk_value SK_VALUE
#ifdef __VAX
#define OPENSSL_NO_SHA256
#endif
#define SHA256_Final SHA256_FINAL
#define SHA256_Init SHA256_INIT
#define SHA256_Update SHA256_UPDATE
#define USE_UPPERCASE_GSSAPI 1 #define USE_UPPERCASE_GSSAPI 1
#define gss_seal GSS_SEAL #define gss_seal GSS_SEAL

8
lib/vtls/openssl.c
View File

@ -68,7 +68,7 @@
#include <openssl/pkcs12.h> #include <openssl/pkcs12.h>
#endif #endif
#ifndef HAVE_BORINGSSL #if (OPENSSL_VERSION_NUMBER >= 0x0090808fL) && !defined(OPENSSL_IS_BORINGSSL)
#include <openssl/ocsp.h> #include <openssl/ocsp.h>
#endif #endif
@ -136,8 +136,8 @@
#define CONF_modules_load_file(a,b,c) #define CONF_modules_load_file(a,b,c)
#endif #endif
#ifdef OPENSSL_IS_BORINGSSL #if (OPENSSL_VERSION_NUMBER < 0x0090808fL) || defined(OPENSSL_IS_BORINGSSL)
/* not present in BoringSSL */ /* not present in BoringSSL or older OpenSSL */
#define OPENSSL_load_builtin_modules(x) #define OPENSSL_load_builtin_modules(x)
#endif #endif
@ -3183,6 +3183,7 @@ void Curl_ossl_md5sum(unsigned char *tmp, /* input */
MD5_Final(md5sum, &MD5pw); MD5_Final(md5sum, &MD5pw);
} }
#ifndef OPENSSL_NO_SHA256
void Curl_ossl_sha256sum(const unsigned char *tmp, /* input */ void Curl_ossl_sha256sum(const unsigned char *tmp, /* input */
size_t tmplen, size_t tmplen,
unsigned char *sha256sum /* output */, unsigned char *sha256sum /* output */,
@ -3194,6 +3195,7 @@ void Curl_ossl_sha256sum(const unsigned char *tmp, /* input */
SHA256_Update(&SHA256pw, tmp, tmplen); SHA256_Update(&SHA256pw, tmp, tmplen);
SHA256_Final(sha256sum, &SHA256pw); SHA256_Final(sha256sum, &SHA256pw);
} }
#endif
bool Curl_ossl_cert_status_request(void) bool Curl_ossl_cert_status_request(void)
{ {

2
lib/vtls/openssl.h
View File

@ -108,7 +108,9 @@ bool Curl_ossl_cert_status_request(void);
#define curlssl_data_pending(x,y) Curl_ossl_data_pending(x,y) #define curlssl_data_pending(x,y) Curl_ossl_data_pending(x,y)
#define curlssl_random(x,y,z) Curl_ossl_random(x,y,z) #define curlssl_random(x,y,z) Curl_ossl_random(x,y,z)
#define curlssl_md5sum(a,b,c,d) Curl_ossl_md5sum(a,b,c,d) #define curlssl_md5sum(a,b,c,d) Curl_ossl_md5sum(a,b,c,d)
#ifndef OPENSSL_NO_SHA256
#define curlssl_sha256sum(a,b,c,d) Curl_ossl_sha256sum(a,b,c,d) #define curlssl_sha256sum(a,b,c,d) Curl_ossl_sha256sum(a,b,c,d)
#endif
#define curlssl_cert_status_request() Curl_ossl_cert_status_request() #define curlssl_cert_status_request() Curl_ossl_cert_status_request()
#define DEFAULT_CIPHER_SELECTION \ #define DEFAULT_CIPHER_SELECTION \