aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/libs/openssl
diff options
context:
space:
mode:
authorMikhail Borisov <borisov.mikhail@gmail.com>2022-02-10 16:45:39 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:45:39 +0300
commita6a92afe03e02795227d2641b49819b687f088f8 (patch)
treef6984a1d27d5a7ec88a6fdd6e20cd5b7693b6ece /contrib/libs/openssl
parentc6dc8b8bd530985bc4cce0137e9a5de32f1087cb (diff)
downloadydb-a6a92afe03e02795227d2641b49819b687f088f8.tar.gz
Restoring authorship annotation for Mikhail Borisov <borisov.mikhail@gmail.com>. Commit 1 of 2.
Diffstat (limited to 'contrib/libs/openssl')
-rw-r--r--contrib/libs/openssl/crypto/ya.make100
-rw-r--r--contrib/libs/openssl/include/openssl/opensslconf.h4
-rw-r--r--contrib/libs/openssl/ya.make20
3 files changed, 62 insertions, 62 deletions
diff --git a/contrib/libs/openssl/crypto/ya.make b/contrib/libs/openssl/crypto/ya.make
index 3acfb0cac7..d9d44d9370 100644
--- a/contrib/libs/openssl/crypto/ya.make
+++ b/contrib/libs/openssl/crypto/ya.make
@@ -31,16 +31,16 @@ ADDINCL(
contrib/libs/openssl/include
)
-IF (OS_LINUX)
- IF (ARCH_ARM64)
- SET(LINUX_ARM64 yes)
+IF (OS_LINUX)
+ IF (ARCH_ARM64)
+ SET(LINUX_ARM64 yes)
ELSEIF (ARCH_ARM7)
- SET(LINUX_ARMV7 yes)
+ SET(LINUX_ARMV7 yes)
ELSEIF (ARCH_X86_64)
- SET(LINUX_X86_64 yes)
- ENDIF()
-ENDIF()
-
+ SET(LINUX_X86_64 yes)
+ ENDIF()
+ENDIF()
+
IF (OS_IOS)
IF (ARCH_ARM64)
SET(IOS_ARM64 yes)
@@ -110,7 +110,7 @@ IF (NOT IOS_I386 AND NOT ANDROID_I686 AND NOT WINDOWS_I686)
)
ENDIF()
-IF (NOT IOS_ARMV7 AND NOT ANDROID_ARMV7 AND NOT LINUX_ARMV7)
+IF (NOT IOS_ARMV7 AND NOT ANDROID_ARMV7 AND NOT LINUX_ARMV7)
CFLAGS(
-DVPAES_ASM
)
@@ -845,7 +845,7 @@ IF (NOT IOS_ARM64 AND NOT IOS_ARMV7)
)
ENDIF()
-IF (NOT IOS_ARMV7 AND NOT ANDROID_ARMV7 AND NOT LINUX_ARMV7)
+IF (NOT IOS_ARMV7 AND NOT ANDROID_ARMV7 AND NOT LINUX_ARMV7)
SRCS(
aes/aes_core.c
)
@@ -936,50 +936,50 @@ IF (OS_DARWIN AND ARCH_ARM64)
)
ENDIF()
-IF (OS_LINUX AND ARCH_ARM7)
- IF (CLANG)
+IF (OS_LINUX AND ARCH_ARM7)
+ IF (CLANG)
# XXX: This is a workarond for 'out of range immediate fixup value'
- # error with clang integrated assembler:
- # https://github.com/openssl/openssl/issues/7878
+ # error with clang integrated assembler:
+ # https://github.com/openssl/openssl/issues/7878
CFLAGS(
-mno-thumb
)
- ENDIF()
- CFLAGS(
- -DOPENSSL_PIC
- -DOPENSSL_BN_ASM_GF2m
- -DAES_ASM
- -DBSAES_ASM
- -DGHASH_ASM
- )
- SRCS(
- ../asm/android/arm/crypto/ec/ecp_nistz256-armv4.S
- ../asm/android/arm/crypto/poly1305/poly1305-armv4.S
- ../asm/android/arm/crypto/armv4cpuid.S
- ../asm/android/arm/crypto/bn/armv4-mont.S
- ../asm/android/arm/crypto/bn/armv4-gf2m.S
- ../asm/android/arm/crypto/aes/aes-armv4.S
- ../asm/android/arm/crypto/aes/bsaes-armv7.S
- ../asm/android/arm/crypto/aes/aesv8-armx.S
- ../asm/android/arm/crypto/sha/keccak1600-armv4.S
- ../asm/android/arm/crypto/sha/sha256-armv4.S
- ../asm/android/arm/crypto/sha/sha512-armv4.S
- ../asm/android/arm/crypto/sha/sha1-armv4-large.S
- ../asm/android/arm/crypto/chacha/chacha-armv4.S
- ../asm/android/arm/crypto/modes/ghashv8-armx.S
- ../asm/android/arm/crypto/modes/ghash-armv4.S
- armcap.c
- bn/bn_asm.c
- camellia/camellia.c
- camellia/cmll_cbc.c
- dso/dso_dlfcn.c
- rand/rand_vms.c
- rc4/rc4_enc.c
- rc4/rc4_skey.c
- whrlpool/wp_block.c
- )
-ENDIF()
-
+ ENDIF()
+ CFLAGS(
+ -DOPENSSL_PIC
+ -DOPENSSL_BN_ASM_GF2m
+ -DAES_ASM
+ -DBSAES_ASM
+ -DGHASH_ASM
+ )
+ SRCS(
+ ../asm/android/arm/crypto/ec/ecp_nistz256-armv4.S
+ ../asm/android/arm/crypto/poly1305/poly1305-armv4.S
+ ../asm/android/arm/crypto/armv4cpuid.S
+ ../asm/android/arm/crypto/bn/armv4-mont.S
+ ../asm/android/arm/crypto/bn/armv4-gf2m.S
+ ../asm/android/arm/crypto/aes/aes-armv4.S
+ ../asm/android/arm/crypto/aes/bsaes-armv7.S
+ ../asm/android/arm/crypto/aes/aesv8-armx.S
+ ../asm/android/arm/crypto/sha/keccak1600-armv4.S
+ ../asm/android/arm/crypto/sha/sha256-armv4.S
+ ../asm/android/arm/crypto/sha/sha512-armv4.S
+ ../asm/android/arm/crypto/sha/sha1-armv4-large.S
+ ../asm/android/arm/crypto/chacha/chacha-armv4.S
+ ../asm/android/arm/crypto/modes/ghashv8-armx.S
+ ../asm/android/arm/crypto/modes/ghash-armv4.S
+ armcap.c
+ bn/bn_asm.c
+ camellia/camellia.c
+ camellia/cmll_cbc.c
+ dso/dso_dlfcn.c
+ rand/rand_vms.c
+ rc4/rc4_enc.c
+ rc4/rc4_skey.c
+ whrlpool/wp_block.c
+ )
+ENDIF()
+
IF (OS_LINUX AND ARCH_AARCH64)
SRCS(
../asm/aarch64/crypto/aes/aesv8-armx.S
diff --git a/contrib/libs/openssl/include/openssl/opensslconf.h b/contrib/libs/openssl/include/openssl/opensslconf.h
index ecc930a39f..73af98ae42 100644
--- a/contrib/libs/openssl/include/openssl/opensslconf.h
+++ b/contrib/libs/openssl/include/openssl/opensslconf.h
@@ -20,8 +20,8 @@
# include "opensslconf-android-arm.h"
#elif defined(__linux__) && defined(__aarch64__)
# include "opensslconf-linux_aarch64.h"
-#elif defined(__linux__) && defined(__arm__)
-# include "opensslconf-linux_arm.h"
+#elif defined(__linux__) && defined(__arm__)
+# include "opensslconf-linux_arm.h"
#elif defined(_MSC_VER) && defined(_M_X64)
# include "opensslconf-win-x86_64.h"
#elif defined(_MSC_VER) && defined(_M_IX86)
diff --git a/contrib/libs/openssl/ya.make b/contrib/libs/openssl/ya.make
index 060d069785..68f24fee46 100644
--- a/contrib/libs/openssl/ya.make
+++ b/contrib/libs/openssl/ya.make
@@ -28,16 +28,16 @@ ADDINCL(
contrib/libs/openssl
)
-IF (OS_LINUX)
- IF (ARCH_ARM64)
- SET(LINUX_ARM64 yes)
+IF (OS_LINUX)
+ IF (ARCH_ARM64)
+ SET(LINUX_ARM64 yes)
ELSEIF (ARCH_ARM7)
- SET(LINUX_ARMV7 yes)
+ SET(LINUX_ARMV7 yes)
ELSEIF (ARCH_X86_64)
- SET(LINUX_X86_64 yes)
- ENDIF()
-ENDIF()
-
+ SET(LINUX_X86_64 yes)
+ ENDIF()
+ENDIF()
+
IF (OS_IOS)
IF (ARCH_ARM64)
SET(IOS_ARM64 yes)
@@ -225,7 +225,7 @@ SRCS(
ssl/tls_srp.c
)
-IF (NOT IOS_ARMV7 AND NOT LINUX_ARMV7)
+IF (NOT IOS_ARMV7 AND NOT LINUX_ARMV7)
CFLAGS(
-DVPAES_ASM
)
@@ -238,7 +238,7 @@ IF (NOT IOS_ARM64 AND NOT IOS_ARMV7)
)
ENDIF()
-IF (OS_LINUX AND ARCH_ARM7 OR OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64 OR OS_LINUX AND ARCH_PPC64LE)
+IF (OS_LINUX AND ARCH_ARM7 OR OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64 OR OS_LINUX AND ARCH_PPC64LE)
SRCS(
engines/e_afalg.c
)