OpenSSL 0.9.5 merge

*warning* this bumps shared lib minors for libssl and libcrypto from 2.1 to 2.2
if you are using the ssl26 packages for ssh and other things to work you will
need to get new ones (see ~beck/libsslsnap/<arch>) on cvs or ~beck/src-patent.tar.gz on cvs

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/libssl/ssl2.h b/src/lib/libssl/ssl2.h
index d7f24ac1b4..01d41c88c5 100644
--- a/src/lib/libssl/ssl2.h
+++ b/src/lib/libssl/ssl2.h
@@ -151,7 +151,7 @@ extern "C" {
 #define  CERT           char
 #endif
 
-typedef struct ssl2_ctx_st
+typedef struct ssl2_state_st
         {
         int three_byte_header;
         int clear_text;         /* clear text */
@@ -214,7 +214,7 @@ typedef struct ssl2_ctx_st
                 unsigned int clen;
                 unsigned int rlen;
                 } tmp;
-        } SSL2_CTX;
+        } SSL2_STATE;
 
 /* SSLv2 */
 /* client */