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, 6 insertions, 1 deletions

diff --git a/src/lib/libssl/ssl_txt.c b/src/lib/libssl/ssl_txt.c
index ca67a98d89..7e27857bcf 100644
--- a/src/lib/libssl/ssl_txt.c
+++ b/src/lib/libssl/ssl_txt.c
@@ -112,7 +112,7 @@ int SSL_SESSION_print(BIO *bp, SSL_SESSION *x)
                 sprintf(str,"%02X",x->session_id[i]);
                 if (BIO_puts(bp,str) <= 0) goto err;
                 }
-        if (BIO_puts(bp,"\nSession-ID-ctx: ") <= 0) goto err;
+        if (BIO_puts(bp,"\n    Session-ID-ctx: ") <= 0) goto err;
         for (i=0; i<x->sid_ctx_length; i++)
                 {
                 sprintf(str,"%02X",x->sid_ctx[i]);
@@ -163,6 +163,11 @@ int SSL_SESSION_print(BIO *bp, SSL_SESSION *x)
                 if (BIO_puts(bp,str) <= 0) goto err;
                 }
         if (BIO_puts(bp,"\n") <= 0) goto err;
+
+        if (BIO_puts(bp, "    Verify return code ") <= 0) goto err;
+        sprintf(str, "%ld (%s)\n", x->verify_result, 
+                        X509_verify_cert_error_string(x->verify_result));
+        if (BIO_puts(bp,str) <= 0) goto err;
                 
         return(1);
 err: