diff options
| author | somov <somov@yandex-team.ru> | 2022-02-10 16:45:49 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:49 +0300 |
| commit | 7489e4682331202b9c7d863c0898eb83d7b12c2b (patch) | |
| tree | 9142afc54d335ea52910662635b898e79e192e49 /contrib/libs/openssl | |
| parent | a5950576e397b1909261050b8c7da16db58f10b1 (diff) | |
| download | ydb-7489e4682331202b9c7d863c0898eb83d7b12c2b.tar.gz | |
Restoring authorship annotation for <somov@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'contrib/libs/openssl')
| -rw-r--r-- | contrib/libs/openssl/dynamic/ya.make | 10 | ||||
| -rw-r--r-- | contrib/libs/openssl/include/openssl/opensslconf-linux.h | 40 | ||||
| -rw-r--r-- | contrib/libs/openssl/ssl/ssl_cert.c | 10 |
3 files changed, 30 insertions, 30 deletions
diff --git a/contrib/libs/openssl/dynamic/ya.make b/contrib/libs/openssl/dynamic/ya.make index 906559980c..d68bbe8c4c 100644 --- a/contrib/libs/openssl/dynamic/ya.make +++ b/contrib/libs/openssl/dynamic/ya.make @@ -1,8 +1,8 @@ DLL_FOR(contrib/libs/openssl) - -OWNER( - somov - elantsev + +OWNER( + somov + elantsev g:contrib g:cpp-contrib -) +) diff --git a/contrib/libs/openssl/include/openssl/opensslconf-linux.h b/contrib/libs/openssl/include/openssl/opensslconf-linux.h index ab11275318..e5e3a76622 100644 --- a/contrib/libs/openssl/include/openssl/opensslconf-linux.h +++ b/contrib/libs/openssl/include/openssl/opensslconf-linux.h @@ -72,19 +72,19 @@ extern "C" { #ifndef OPENSSL_NO_SSL_TRACE # define OPENSSL_NO_SSL_TRACE #endif - -// https://st.yandex-team.ru/DEVTOOLS-5331 -#define Y_OPENSSL_ENABLE_DEPRECATED - -#if !defined(Y_OPENSSL_ENABLE_DEPRECATED) -# ifndef OPENSSL_NO_SSL3 -# define OPENSSL_NO_SSL3 -# endif -# ifndef OPENSSL_NO_SSL3_METHOD -# define OPENSSL_NO_SSL3_METHOD -# endif -#endif - + +// https://st.yandex-team.ru/DEVTOOLS-5331 +#define Y_OPENSSL_ENABLE_DEPRECATED + +#if !defined(Y_OPENSSL_ENABLE_DEPRECATED) +# ifndef OPENSSL_NO_SSL3 +# define OPENSSL_NO_SSL3 +# endif +# ifndef OPENSSL_NO_SSL3_METHOD +# define OPENSSL_NO_SSL3_METHOD +# endif +#endif + #ifndef OPENSSL_NO_TESTS # define OPENSSL_NO_TESTS #endif @@ -94,14 +94,14 @@ extern "C" { #ifndef OPENSSL_NO_UNIT_TEST # define OPENSSL_NO_UNIT_TEST #endif - -// https://st.yandex-team.ru/DEVTOOLS-5331 -#if !defined(Y_OPENSSL_ENABLE_DEPRECATED) -# ifndef OPENSSL_NO_WEAK_SSL_CIPHERS -# define OPENSSL_NO_WEAK_SSL_CIPHERS -# endif + +// https://st.yandex-team.ru/DEVTOOLS-5331 +#if !defined(Y_OPENSSL_ENABLE_DEPRECATED) +# ifndef OPENSSL_NO_WEAK_SSL_CIPHERS +# define OPENSSL_NO_WEAK_SSL_CIPHERS +# endif #endif - + #ifndef OPENSSL_NO_DYNAMIC_ENGINE # define OPENSSL_NO_DYNAMIC_ENGINE #endif diff --git a/contrib/libs/openssl/ssl/ssl_cert.c b/contrib/libs/openssl/ssl/ssl_cert.c index d657e668c3..a592e3382f 100644 --- a/contrib/libs/openssl/ssl/ssl_cert.c +++ b/contrib/libs/openssl/ssl/ssl_cert.c @@ -926,14 +926,14 @@ static int ssl_security_default_callback(const SSL *s, const SSL_CTX *ctx, /* No unauthenticated ciphersuites */ if (c->algorithm_auth & SSL_aNULL) return 0; - - // https://st.yandex-team.ru/DEVTOOLS-5331 -#if !defined(Y_OPENSSL_ENABLE_DEPRECATED) + + // https://st.yandex-team.ru/DEVTOOLS-5331 +#if !defined(Y_OPENSSL_ENABLE_DEPRECATED) /* No MD5 mac ciphersuites */ if (c->algorithm_mac & SSL_MD5) return 0; -#endif - +#endif + /* SHA1 HMAC is 160 bits of security */ if (minbits > 160 && c->algorithm_mac & SSL_SHA1) return 0; |