From ebe71871447f0112adf84943c2e1e48c32343c77 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 18 Jun 2014 02:37:21 +0000 Subject: Haiku: build fixes diff --git a/Configure b/Configure index 5da7cad..a366e88 100755 --- a/Configure +++ b/Configure @@ -508,6 +508,10 @@ my %table=( "beos-x86-r5", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so", "beos-x86-bone", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lbind -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC:-shared:.so", +##### Haiku +"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"haiku-x86_64", "gcc:-m64 -DL_ENDIAN -O2 -Wall -DMD32_REG_T=int::-D_REENTRANT::-lnetwork:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:haiku-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", + #### SCO/Caldera targets. # # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc. diff --git a/Makefile.shared b/Makefile.shared index e8d222a..2216c8b 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -594,10 +594,10 @@ symlink.hpux: symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos: # Compatibility targets -link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu -link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu -link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu -symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu +link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu +link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu +link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu +symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu link_o.bsd-shared: link_o.bsd link_a.bsd-shared: link_a.bsd link_app.bsd-shared: link_app.bsd diff --git a/config b/config index bba370c..d4d0620 100755 --- a/config +++ b/config @@ -134,6 +134,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "${MACHINE}-dg-dgux"; exit 0 ;; + Haiku:*:BePC) + echo "i586-pc-haiku"; exit 0 + ;; + + Haiku:*:*) + echo "${MACHINE}-unknown-haiku"; exit 0 + ;; + HI-UX:*) echo "${MACHINE}-hi-hiux"; exit 0 ;; @@ -848,6 +856,9 @@ case "$GUESSOS" in options="$options no-asm" fi ;; + i586-*-haiku) OUT="haiku-x86" ;; + x86_64-*-haiku) OUT="haiku-x86_64" ;; + # these are all covered by the catchall below # *-dgux) OUT="dgux" ;; mips-sony-newsos4) OUT="newsos4-gcc" ;; -- 2.7.0 From 56aa0cc3ac136c72309364f6e723a61b1dac1462 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 18 Jun 2014 02:39:12 +0000 Subject: Haiku: Modify default Root CA filename diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h index fba180a..40c32df 100644 --- a/crypto/cryptlib.h +++ b/crypto/cryptlib.h @@ -82,7 +82,7 @@ extern "C" { # ifndef OPENSSL_SYS_VMS # define X509_CERT_AREA OPENSSLDIR # define X509_CERT_DIR OPENSSLDIR "/certs" -# define X509_CERT_FILE OPENSSLDIR "/cert.pem" +# define X509_CERT_FILE OPENSSLDIR "/CARootCertificates.pem" # define X509_PRIVATE_DIR OPENSSLDIR "/private" # else # define X509_CERT_AREA "SSLROOT:[000000]" -- 2.7.0 From 9992048c0a9ef4a1fefdff9981a553c0a2130bc2 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 9 Nov 2015 19:44:10 +0100 Subject: Do not use __INTEL__ to detect x86_64. * Haiku defines it for 32-bit x86 as well. diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c index 6dfd590..bc571e5 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha1.c +++ b/crypto/evp/e_aes_cbc_hmac_sha1.c @@ -92,8 +92,7 @@ typedef struct { # if defined(AES_ASM) && ( \ defined(__x86_64) || defined(__x86_64__) || \ - defined(_M_AMD64) || defined(_M_X64) || \ - defined(__INTEL__) ) + defined(_M_AMD64) || defined(_M_X64) ) extern unsigned int OPENSSL_ia32cap_P[]; # define AESNI_CAPABLE (1<<(57-32)) -- 2.7.0 From f3b305a87bf7d6c514190f23545d4df20c07c016 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 9 Nov 2015 20:32:09 +0100 Subject: more __intel__ fixes... diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c index 46c9d03..4a9ad27 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha256.c +++ b/crypto/evp/e_aes_cbc_hmac_sha256.c @@ -92,8 +92,7 @@ typedef struct { # if defined(AES_ASM) && ( \ defined(__x86_64) || defined(__x86_64__) || \ - defined(_M_AMD64) || defined(_M_X64) || \ - defined(__INTEL__) ) + defined(_M_AMD64) || defined(_M_X64) ) extern unsigned int OPENSSL_ia32cap_P[]; # define AESNI_CAPABLE (1<<(57-32)) diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c index 93cfe3f..dc3937f 100644 --- a/crypto/evp/e_rc4_hmac_md5.c +++ b/crypto/evp/e_rc4_hmac_md5.c @@ -101,8 +101,7 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, # if defined(RC4_ASM) && defined(MD5_ASM) && ( \ defined(__x86_64) || defined(__x86_64__) || \ - defined(_M_AMD64) || defined(_M_X64) || \ - defined(__INTEL__) ) && \ + defined(_M_AMD64) || defined(_M_X64) ) && \ !(defined(__APPLE__) && defined(__MACH__)) # define STITCHED_CALL # endif diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index 6ece87d..1e569bb 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -125,8 +125,7 @@ #if defined(OPENSSL_SMALL_FOOTPRINT) || \ !( defined(AES_ASM) && ( \ defined(__x86_64) || defined(__x86_64__) || \ - defined(_M_AMD64) || defined(_M_X64) || \ - defined(__INTEL__) ) \ + defined(_M_AMD64) || defined(_M_X64) ) \ ) # undef EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK # define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0 -- 2.7.0