Re: Fwd: [PATCH] cleanup unused definitions

[William Lallemand]

On Wed, Mar 24, 2021 at 08:09:05AM +0100, Willy Tarreau wrote:
> William,
> 
> could you please have a quick look at these ? I didn't touch them because
> I don't know if these are things you intend to use in the short-to-mid
> term. If you take them, please be careful to fix the subject to mention
> "ssl" in them.
> 
> Thanks,
> Willy
> 
> - Forwarded message from  ???  -
> 
> > Date: Wed, 24 Mar 2021 11:29:03 +0500
> > From:  ??? 
> > Subject: Re: [PATCH] cleanup unused definitions
> > To: HAProxy , Willy Tarreau 
> > Delivered-To: haproxy@formilux.org
> > List-Id: Haproxy 
> > 
> > ping
> > 
> > ??, 20 ???. 2021 ?. ? 22:43,  ??? :
> > 
> > > while refactoring HA_OPENSSL_VERSION usage,
> > > I've found unused definitions. nice.
> > >
> > >
> > > Ilya
> > >
> 
> - End forwarded message -
> - Forwarded message from  ???  -
> 
> > Date: Wed, 24 Mar 2021 11:29:19 +0500
> > From:  ??? 
> > Subject: Re: [PATCH] BUILD: ssl: use feature guard instead of openssl 
> > version for ecdh functions
> > To: HAProxy , Willy Tarreau 
> > Delivered-To: haproxy@formilux.org
> > List-Id: Haproxy 
> > 
> > ping
> > 
> > ??, 21 ???. 2021 ?. ? 13:02,  ??? :
> > 
> > > Hello,
> > >
> > > yet another patch that reduces number of HA_OPENSSL_VERSION use
> > >
> > > Ilya
> > >
> > >
> > >
> 
> - End forwarded message -
> 

Thanks, both merged.

-- 
William Lallemand

Re: [PATCH] cleanup unused definitions

[William Lallemand]

On Wed, Mar 24, 2021 at 11:29:03AM +0500, Илья Шипицин wrote:
> ping
> 
> сб, 20 мар. 2021 г. в 22:43, Илья Шипицин :
> 
> > while refactoring HA_OPENSSL_VERSION usage,
> > I've found unused definitions. nice.
> >
> >
> > Ilya
> >

Thanks, merged.


-- 
William Lallemand

Fwd: [PATCH] cleanup unused definitions

[Willy Tarreau]

William,

could you please have a quick look at these ? I didn't touch them because
I don't know if these are things you intend to use in the short-to-mid
term. If you take them, please be careful to fix the subject to mention
"ssl" in them.

Thanks,
Willy

- Forwarded message from  ???  -

> Date: Wed, 24 Mar 2021 11:29:03 +0500
> From:  ??? 
> Subject: Re: [PATCH] cleanup unused definitions
> To: HAProxy , Willy Tarreau 
> Delivered-To: haproxy@formilux.org
> List-Id: Haproxy 
> 
> ping
> 
> ??, 20 ???. 2021 ?. ? 22:43,  ??? :
> 
> > while refactoring HA_OPENSSL_VERSION usage,
> > I've found unused definitions. nice.
> >
> >
> > Ilya
> >

- End forwarded message -
- Forwarded message from  ???  -

> Date: Wed, 24 Mar 2021 11:29:19 +0500
> From:  ??? 
> Subject: Re: [PATCH] BUILD: ssl: use feature guard instead of openssl version 
> for ecdh functions
> To: HAProxy , Willy Tarreau 
> Delivered-To: haproxy@formilux.org
> List-Id: Haproxy 
> 
> ping
> 
> ??, 21 ???. 2021 ?. ? 13:02,  ??? :
> 
> > Hello,
> >
> > yet another patch that reduces number of HA_OPENSSL_VERSION use
> >
> > Ilya
> >
> >
> >

- End forwarded message -

Re: [PATCH] cleanup unused definitions

[Илья Шипицин]

ping

сб, 20 мар. 2021 г. в 22:43, Илья Шипицин :

> while refactoring HA_OPENSSL_VERSION usage,
> I've found unused definitions. nice.
>
>
> Ilya
>

[PATCH] cleanup unused definitions

[Илья Шипицин]

while refactoring HA_OPENSSL_VERSION usage,
I've found unused definitions. nice.


Ilya
From c5ba9de13cb7d5eda4781731bb4bfb68c823114c Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin 
Date: Sat, 20 Mar 2021 22:30:59 +0500
Subject: [PATCH] CLEANUP: remove unused definitions

not need since 	e7eb1fec2f2349359c752c8fbb82357b14c7e4cf
---
 include/haproxy/ssl_sock-t.h | 20 
 1 file changed, 20 deletions(-)

diff --git a/include/haproxy/ssl_sock-t.h b/include/haproxy/ssl_sock-t.h
index c0f47cbb6..991a08b3d 100644
--- a/include/haproxy/ssl_sock-t.h
+++ b/include/haproxy/ssl_sock-t.h
@@ -175,26 +175,6 @@ struct sh_ssl_sess_hdr {
 	unsigned char key_data[SSL_MAX_SSL_SESSION_ID_LENGTH];
 };
 
-#if HA_OPENSSL_VERSION_NUMBER >= 0x1000200fL
-
-#define SSL_SOCK_POSSIBLE_KT_COMBOS (1<<(SSL_SOCK_NUM_KEYTYPES))
-
-struct key_combo_ctx {
-	SSL_CTX *ctx;
-	int order;
-};
-
-/* Map used for processing multiple keypairs for a single purpose
- *
- * This maps CN/SNI name to certificate type
- */
-struct sni_keytype {
-	int keytypes;			  /* BITMASK for keytypes */
-	struct ebmb_node name;/* node holding the servername value */
-};
-
-#endif
-
 /* issuer chain store with hash of Subject Key Identifier
certificate/issuer matching is verify with X509_check_issued
 */
-- 
2.29.2