Attachment 6503 Details for Bug 31752 – patch to disable tls_check_version in src/tls code

[patch] patch to disable tls_check_version in src/tls code

0003-tls-disable-tls_check_version.patch (text/plain), 1.99 KB, created by Konstantin A Lepikhov (L.A. Kostis) on 2016-02-19 14:27:11 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Konstantin A Lepikhov (L.A. Kostis)

Created: 2016-02-19 14:27:11 MSK

Size: 1.99 KB

patch

obsolete

>From 094c54c4a1efcd14686b52e068b6b865b47592f7 Mon Sep 17 00:00:00 2001
>From: "Konstantin A. Lepikhov" <lakostis@altlinux.ru>
>Date: Fri, 19 Feb 2016 11:23:28 +0000
>Subject: [PATCH 3/3] tls: disable tls_check_version()
>
>ALTLinux uses ABI check to ensure that ssl library still compabible with
>userspace. Disable internal check and mute warnings about.
>
>(ALT #31752)
>
>Signed-off-by: Konstantin A. Lepikhov <lakostis@altlinux.ru>
>---
> src/tls/tls_client.c | 5 ++++-
> src/tls/tls_dane.c   | 4 +++-
> src/tls/tls_server.c | 4 +++-
> 3 files changed, 10 insertions(+), 3 deletions(-)
>
>diff --git a/src/tls/tls_client.c b/src/tls/tls_client.c
>index 039e704..25920e0 100644
>--- a/src/tls/tls_client.c
>+++ b/src/tls/tls_client.c
>@@ -296,7 +296,10 @@ TLS_APPL_STATE *tls_client_init(const TLS_CLIENT_INIT_PROPS *props)
>     /*
>      * Detect mismatch between compile-time headers and run-time library.
>      */
>-    tls_check_version();
>+    /*
>+     * ALT #31752: use ABI check instead
>+     * tls_check_version();
>+     */
> 
>     /*
>      * Initialize the OpenSSL library by the book! To start with, we must
>diff --git a/src/tls/tls_dane.c b/src/tls/tls_dane.c
>index ccd006d..8fbd146 100644
>--- a/src/tls/tls_dane.c
>+++ b/src/tls/tls_dane.c
>@@ -2157,7 +2157,9 @@ static SSL_CTX *ctx_init(const char *CAfile)
>     SSL_CTX *client_ctx;
> 
>     tls_param_init();
>-    tls_check_version();
>+    /* ALT #31752: use ABI check instead
>+     * tls_check_version();
>+     */
> 
>     SSL_load_error_strings();
>     SSL_library_init();
>diff --git a/src/tls/tls_server.c b/src/tls/tls_server.c
>index 279ba37..372f9b7 100644
>--- a/src/tls/tls_server.c
>+++ b/src/tls/tls_server.c
>@@ -353,7 +353,9 @@ TLS_APPL_STATE *tls_server_init(const TLS_SERVER_INIT_PROPS *props)
>     /*
>      * Detect mismatch between compile-time headers and run-time library.
>      */
>-    tls_check_version();
>+    /* ALT #31752: use ABI check instead
>+     * tls_check_version();
>+     */
> 
>     /*
>      * Initialize the OpenSSL library by the book! To start with, we must
>-- 
>2.6.5
>

Actions: View | Diff

Attachments on bug 31752: 6503