diff options
62 files changed, 62 insertions, 63 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index b31dc005..3115279f 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. ../include) +include_directories(../include) if(APPLE) if (${ARCH} STREQUAL "x86") diff --git a/crypto/aes/CMakeLists.txt b/crypto/aes/CMakeLists.txt index 90d9921a..c82d99ab 100644 --- a/crypto/aes/CMakeLists.txt +++ b/crypto/aes/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) if (${ARCH} STREQUAL "x86_64") set( diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl index 36cd3b6d..882017a6 100644 --- a/crypto/aes/asm/aes-armv4.pl +++ b/crypto/aes/asm/aes-armv4.pl @@ -65,7 +65,7 @@ $rounds="r12"; $code=<<___; #if defined(__arm__) #ifndef __KERNEL__ -# include "arm_arch.h" +# include <openssl/arm_arch.h> #else # define __ARM_ARCH__ __LINUX_ARM_ARCH__ #endif diff --git a/crypto/aes/asm/aesv8-armx.pl b/crypto/aes/asm/aesv8-armx.pl index b0916f66..121154a4 100644 --- a/crypto/aes/asm/aesv8-armx.pl +++ b/crypto/aes/asm/aesv8-armx.pl @@ -45,7 +45,7 @@ open OUT,"| \"$^X\" $xlate $flavour $output"; $prefix="aes_v8"; $code=<<___; -#include "arm_arch.h" +#include <openssl/arm_arch.h> #if __ARM_MAX_ARCH__>=7 .text diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl index 273f0b9e..7fe349a4 100644 --- a/crypto/aes/asm/bsaes-armv7.pl +++ b/crypto/aes/asm/bsaes-armv7.pl @@ -703,7 +703,7 @@ ___ $code.=<<___; #if defined(__arm__) #ifndef __KERNEL__ -# include "arm_arch.h" +# include <openssl/arm_arch.h> # define VFP_ABI_PUSH vstmdb sp!,{d8-d15} # define VFP_ABI_POP vldmia sp!,{d8-d15} diff --git a/crypto/asn1/CMakeLists.txt b/crypto/asn1/CMakeLists.txt index 283636e2..41e31224 100644 --- a/crypto/asn1/CMakeLists.txt +++ b/crypto/asn1/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( asn1 diff --git a/crypto/base64/CMakeLists.txt b/crypto/base64/CMakeLists.txt index 42037a52..f1dba6cb 100644 --- a/crypto/base64/CMakeLists.txt +++ b/crypto/base64/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( base64 diff --git a/crypto/bio/CMakeLists.txt b/crypto/bio/CMakeLists.txt index dbf59517..8de090af 100644 --- a/crypto/bio/CMakeLists.txt +++ b/crypto/bio/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( bio diff --git a/crypto/bn/CMakeLists.txt b/crypto/bn/CMakeLists.txt index 63029cf7..232e40ae 100644 --- a/crypto/bn/CMakeLists.txt +++ b/crypto/bn/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) if (${ARCH} STREQUAL "x86_64") set( diff --git a/crypto/bn/asm/armv4-mont.pl b/crypto/bn/asm/armv4-mont.pl index 0f1b6a90..4206fd85 100644 --- a/crypto/bn/asm/armv4-mont.pl +++ b/crypto/bn/asm/armv4-mont.pl @@ -79,7 +79,7 @@ $_n0="$num,#14*4"; $_num="$num,#15*4"; $_bpend=$_num; $code=<<___; -#include "arm_arch.h" +#include <openssl/arm_arch.h> .text .code 32 diff --git a/crypto/buf/CMakeLists.txt b/crypto/buf/CMakeLists.txt index 19edf7d5..63f10255 100644 --- a/crypto/buf/CMakeLists.txt +++ b/crypto/buf/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( buf diff --git a/crypto/bytestring/CMakeLists.txt b/crypto/bytestring/CMakeLists.txt index cbbacf2a..3462aee6 100644 --- a/crypto/bytestring/CMakeLists.txt +++ b/crypto/bytestring/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( bytestring diff --git a/crypto/chacha/CMakeLists.txt b/crypto/chacha/CMakeLists.txt index 6c3f87ee..266e8699 100644 --- a/crypto/chacha/CMakeLists.txt +++ b/crypto/chacha/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) if (${ARCH} STREQUAL "arm") set( diff --git a/crypto/cipher/CMakeLists.txt b/crypto/cipher/CMakeLists.txt index 27756981..6b4c729d 100644 --- a/crypto/cipher/CMakeLists.txt +++ b/crypto/cipher/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( cipher diff --git a/crypto/cipher/e_aes.c b/crypto/cipher/e_aes.c index c014d190..e8905f6a 100644 --- a/crypto/cipher/e_aes.c +++ b/crypto/cipher/e_aes.c @@ -64,7 +64,7 @@ #include "../modes/internal.h" #if defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) -#include "../arm_arch.h" +#include <openssl/arm_arch.h> #endif @@ -111,7 +111,6 @@ static char bsaes_capable(void) { #elif !defined(OPENSSL_NO_ASM) && \ (defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)) -#include "../arm_arch.h" #if defined(OPENSSL_ARM) && __ARM_MAX_ARCH__ >= 7 #define BSAES diff --git a/crypto/cmac/CMakeLists.txt b/crypto/cmac/CMakeLists.txt index 7a071606..bb3abc3b 100644 --- a/crypto/cmac/CMakeLists.txt +++ b/crypto/cmac/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( cmac diff --git a/crypto/conf/CMakeLists.txt b/crypto/conf/CMakeLists.txt index 8046bb84..0a3c7953 100644 --- a/crypto/conf/CMakeLists.txt +++ b/crypto/conf/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( conf diff --git a/crypto/cpu-arm.c b/crypto/cpu-arm.c index 31b7de08..6e037ab9 100644 --- a/crypto/cpu-arm.c +++ b/crypto/cpu-arm.c @@ -24,7 +24,7 @@ #include <signal.h> #endif -#include "arm_arch.h" +#include <openssl/arm_arch.h> /* We can't include <sys/auxv.h> because the Android SDK version against which diff --git a/crypto/crypto.c b/crypto/crypto.c index d9bb07e9..34d04b4c 100644 --- a/crypto/crypto.c +++ b/crypto/crypto.c @@ -55,7 +55,7 @@ uint32_t OPENSSL_ia32cap_P[4] = {0}; #elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) -#include "arm_arch.h" +#include <openssl/arm_arch.h> #if defined(__ARM_NEON__) uint32_t OPENSSL_armcap_P = ARMV7_NEON | ARMV7_NEON_FUNCTIONAL; diff --git a/crypto/des/CMakeLists.txt b/crypto/des/CMakeLists.txt index 7d49ff3c..f61fa14a 100644 --- a/crypto/des/CMakeLists.txt +++ b/crypto/des/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( des diff --git a/crypto/dh/CMakeLists.txt b/crypto/dh/CMakeLists.txt index d0c1da7f..1a465128 100644 --- a/crypto/dh/CMakeLists.txt +++ b/crypto/dh/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( dh diff --git a/crypto/digest/CMakeLists.txt b/crypto/digest/CMakeLists.txt index 816d1164..856e45a5 100644 --- a/crypto/digest/CMakeLists.txt +++ b/crypto/digest/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( digest diff --git a/crypto/dsa/CMakeLists.txt b/crypto/dsa/CMakeLists.txt index 1bb8b632..e8b7793a 100644 --- a/crypto/dsa/CMakeLists.txt +++ b/crypto/dsa/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( dsa diff --git a/crypto/ec/CMakeLists.txt b/crypto/ec/CMakeLists.txt index b5ebefae..38a91f89 100644 --- a/crypto/ec/CMakeLists.txt +++ b/crypto/ec/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( ec diff --git a/crypto/ecdh/CMakeLists.txt b/crypto/ecdh/CMakeLists.txt index 346e72d8..8eaeae5e 100644 --- a/crypto/ecdh/CMakeLists.txt +++ b/crypto/ecdh/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( ecdh diff --git a/crypto/ecdsa/CMakeLists.txt b/crypto/ecdsa/CMakeLists.txt index f431e59d..e7581be1 100644 --- a/crypto/ecdsa/CMakeLists.txt +++ b/crypto/ecdsa/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( ecdsa diff --git a/crypto/engine/CMakeLists.txt b/crypto/engine/CMakeLists.txt index e03650e3..5667f023 100644 --- a/crypto/engine/CMakeLists.txt +++ b/crypto/engine/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( engine diff --git a/crypto/err/CMakeLists.txt b/crypto/err/CMakeLists.txt index d846fc44..8519e51a 100644 --- a/crypto/err/CMakeLists.txt +++ b/crypto/err/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_custom_command( OUTPUT err_data.c diff --git a/crypto/evp/CMakeLists.txt b/crypto/evp/CMakeLists.txt index 5c22a8a3..5d2e918f 100644 --- a/crypto/evp/CMakeLists.txt +++ b/crypto/evp/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( evp diff --git a/crypto/hkdf/CMakeLists.txt b/crypto/hkdf/CMakeLists.txt index 66d680af..53bf5586 100644 --- a/crypto/hkdf/CMakeLists.txt +++ b/crypto/hkdf/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( hkdf diff --git a/crypto/hmac/CMakeLists.txt b/crypto/hmac/CMakeLists.txt index 11d267ff..392ce012 100644 --- a/crypto/hmac/CMakeLists.txt +++ b/crypto/hmac/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( hmac diff --git a/crypto/lhash/CMakeLists.txt b/crypto/lhash/CMakeLists.txt index c71b8a17..ce785eba 100644 --- a/crypto/lhash/CMakeLists.txt +++ b/crypto/lhash/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( lhash diff --git a/crypto/md4/CMakeLists.txt b/crypto/md4/CMakeLists.txt index db7a187b..59140a72 100644 --- a/crypto/md4/CMakeLists.txt +++ b/crypto/md4/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( md4 diff --git a/crypto/md5/CMakeLists.txt b/crypto/md5/CMakeLists.txt index 6c5e80f1..a37c47e4 100644 --- a/crypto/md5/CMakeLists.txt +++ b/crypto/md5/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) if (${ARCH} STREQUAL "x86_64") set( diff --git a/crypto/modes/CMakeLists.txt b/crypto/modes/CMakeLists.txt index ffb29b62..6da5207e 100644 --- a/crypto/modes/CMakeLists.txt +++ b/crypto/modes/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) if (${ARCH} STREQUAL "x86_64") set( diff --git a/crypto/modes/asm/ghash-armv4.pl b/crypto/modes/asm/ghash-armv4.pl index a0d04cec..dc5b99e8 100644 --- a/crypto/modes/asm/ghash-armv4.pl +++ b/crypto/modes/asm/ghash-armv4.pl @@ -134,7 +134,7 @@ ___ $code=<<___; #if defined(__arm__) -#include "arm_arch.h" +#include <openssl/arm_arch.h> .syntax unified diff --git a/crypto/modes/asm/ghashv8-armx.pl b/crypto/modes/asm/ghashv8-armx.pl index 5856c94a..3a7b8d8b 100644 --- a/crypto/modes/asm/ghashv8-armx.pl +++ b/crypto/modes/asm/ghashv8-armx.pl @@ -54,7 +54,7 @@ my ($Xl,$Xm,$Xh,$IN)=map("q$_",(0..3)); my ($t0,$t1,$t2,$xC2,$H,$Hhl,$H2)=map("q$_",(8..14)); $code=<<___; -#include "arm_arch.h" +#include <openssl/arm_arch.h> .text ___ diff --git a/crypto/modes/gcm.c b/crypto/modes/gcm.c index e7aa46e4..593dce88 100644 --- a/crypto/modes/gcm.c +++ b/crypto/modes/gcm.c @@ -349,7 +349,7 @@ void gcm_ghash_4bit_x86(uint64_t Xi[2], const u128 Htable[16], const uint8_t *in size_t len); #endif #elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) -#include "../arm_arch.h" +#include <openssl/arm_arch.h> #if __ARM_ARCH__ >= 7 #define GHASH_ASM_ARM #define GCM_FUNCREF_4BIT diff --git a/crypto/obj/CMakeLists.txt b/crypto/obj/CMakeLists.txt index a27e504a..b8a4ef37 100644 --- a/crypto/obj/CMakeLists.txt +++ b/crypto/obj/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( obj diff --git a/crypto/pem/CMakeLists.txt b/crypto/pem/CMakeLists.txt index 720ba2ff..30dd7c92 100644 --- a/crypto/pem/CMakeLists.txt +++ b/crypto/pem/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( pem diff --git a/crypto/pkcs8/CMakeLists.txt b/crypto/pkcs8/CMakeLists.txt index 4426f1e7..f0452e9c 100644 --- a/crypto/pkcs8/CMakeLists.txt +++ b/crypto/pkcs8/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( pkcs8 diff --git a/crypto/poly1305/CMakeLists.txt b/crypto/poly1305/CMakeLists.txt index 31ad9d56..674d9f68 100644 --- a/crypto/poly1305/CMakeLists.txt +++ b/crypto/poly1305/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) if (${ARCH} STREQUAL "arm") set( diff --git a/crypto/rand/CMakeLists.txt b/crypto/rand/CMakeLists.txt index 374d8f17..35d5290b 100644 --- a/crypto/rand/CMakeLists.txt +++ b/crypto/rand/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) if (${ARCH} STREQUAL "x86_64") set( diff --git a/crypto/rc4/CMakeLists.txt b/crypto/rc4/CMakeLists.txt index fe2d0c65..a208e960 100644 --- a/crypto/rc4/CMakeLists.txt +++ b/crypto/rc4/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) if (${ARCH} STREQUAL "x86_64") set( diff --git a/crypto/rsa/CMakeLists.txt b/crypto/rsa/CMakeLists.txt index a72731e4..bd8ad3b8 100644 --- a/crypto/rsa/CMakeLists.txt +++ b/crypto/rsa/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( rsa diff --git a/crypto/sha/CMakeLists.txt b/crypto/sha/CMakeLists.txt index 5a10c851..ecff09b8 100644 --- a/crypto/sha/CMakeLists.txt +++ b/crypto/sha/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) if (${ARCH} STREQUAL "x86_64") set( diff --git a/crypto/sha/asm/sha1-armv4-large.pl b/crypto/sha/asm/sha1-armv4-large.pl index a20d3368..64e2ed61 100644 --- a/crypto/sha/asm/sha1-armv4-large.pl +++ b/crypto/sha/asm/sha1-armv4-large.pl @@ -178,7 +178,7 @@ ___ } $code=<<___; -#include "arm_arch.h" +#include <openssl/arm_arch.h> .text .code 32 diff --git a/crypto/sha/asm/sha1-armv8.pl b/crypto/sha/asm/sha1-armv8.pl index a8c08c27..1c4fe4a2 100644 --- a/crypto/sha/asm/sha1-armv8.pl +++ b/crypto/sha/asm/sha1-armv8.pl @@ -162,7 +162,7 @@ ___ } $code.=<<___; -#include "arm_arch.h" +#include <openssl/arm_arch.h> .text diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl index df71676d..7e071474 100644 --- a/crypto/sha/asm/sha256-armv4.pl +++ b/crypto/sha/asm/sha256-armv4.pl @@ -168,7 +168,7 @@ ___ $code=<<___; #ifndef __KERNEL__ -# include "arm_arch.h" +# include <openssl/arm_arch.h> #else # define __ARM_ARCH__ __LINUX_ARM_ARCH__ # define __ARM_MAX_ARCH__ 7 diff --git a/crypto/sha/asm/sha512-armv4.pl b/crypto/sha/asm/sha512-armv4.pl index 2964a39c..cd3662a5 100644 --- a/crypto/sha/asm/sha512-armv4.pl +++ b/crypto/sha/asm/sha512-armv4.pl @@ -191,7 +191,7 @@ ___ } $code=<<___; #ifndef __KERNEL__ -# include "arm_arch.h" +# include <openssl/arm_arch.h> # define VFP_ABI_PUSH vstmdb sp!,{d8-d15} # define VFP_ABI_POP vldmia sp!,{d8-d15} #else diff --git a/crypto/sha/asm/sha512-armv8.pl b/crypto/sha/asm/sha512-armv8.pl index 43e7293f..40eb17a7 100644 --- a/crypto/sha/asm/sha512-armv8.pl +++ b/crypto/sha/asm/sha512-armv8.pl @@ -164,7 +164,7 @@ ___ } $code.=<<___; -#include "arm_arch.h" +#include <openssl/arm_arch.h> .text diff --git a/crypto/stack/CMakeLists.txt b/crypto/stack/CMakeLists.txt index bdb05994..dcd8ef49 100644 --- a/crypto/stack/CMakeLists.txt +++ b/crypto/stack/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( stack diff --git a/crypto/x509/CMakeLists.txt b/crypto/x509/CMakeLists.txt index 9c2a8c46..258c2633 100644 --- a/crypto/x509/CMakeLists.txt +++ b/crypto/x509/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( x509 diff --git a/crypto/x509v3/CMakeLists.txt b/crypto/x509v3/CMakeLists.txt index ca20b097..5cc1b490 100644 --- a/crypto/x509v3/CMakeLists.txt +++ b/crypto/x509v3/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../../include) +include_directories(../../include) add_library( x509v3 diff --git a/decrepit/bio/CMakeLists.txt b/decrepit/bio/CMakeLists.txt index 3da5e5c5..95d92311 100644 --- a/decrepit/bio/CMakeLists.txt +++ b/decrepit/bio/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. ../../include) +include_directories(../../include) add_library( bio_decrepit diff --git a/decrepit/blowfish/CMakeLists.txt b/decrepit/blowfish/CMakeLists.txt index afaf6416..29729c49 100644 --- a/decrepit/blowfish/CMakeLists.txt +++ b/decrepit/blowfish/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. ../../include) +include_directories(../../include) add_library( blowfish diff --git a/decrepit/cast/CMakeLists.txt b/decrepit/cast/CMakeLists.txt index ada99e4e..2830381a 100644 --- a/decrepit/cast/CMakeLists.txt +++ b/decrepit/cast/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. ../../include) +include_directories(../../include) add_library( cast diff --git a/decrepit/des/CMakeLists.txt b/decrepit/des/CMakeLists.txt index 9ca4afb4..0ee5c2e3 100644 --- a/decrepit/des/CMakeLists.txt +++ b/decrepit/des/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. ../../include) +include_directories(../../include) add_library( des_decrepit diff --git a/decrepit/rsa/CMakeLists.txt b/decrepit/rsa/CMakeLists.txt index d499acd6..66d836b1 100644 --- a/decrepit/rsa/CMakeLists.txt +++ b/decrepit/rsa/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. ../../include) +include_directories(../../include) add_library( rsa_decrepit diff --git a/decrepit/xts/CMakeLists.txt b/decrepit/xts/CMakeLists.txt index 2fe4dcf9..7dccde03 100644 --- a/decrepit/xts/CMakeLists.txt +++ b/decrepit/xts/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. ../../include) +include_directories(../../include) add_library( xts diff --git a/crypto/arm_arch.h b/include/openssl/arm_arch.h index 0600fbb1..123a890d 100644 --- a/crypto/arm_arch.h +++ b/include/openssl/arm_arch.h @@ -133,4 +133,4 @@ extern uint32_t OPENSSL_armcap_P; #define ARMV8_PMULL (1 << 5) -#endif /* OPENSSL_HEADER_THREAD_H */ +#endif /* OPENSSL_HEADER_ARM_ARCH_H */ diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index ae241ae8..856a5afb 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(. .. ../include) +include_directories(../include) add_subdirectory(pqueue) |