Chop off more SSLv2 tentacles and start fixing and noting y2038 issues.

APIs that pass times as longs will have to change at some point...
Bump major on both libcrypto and libssl.

ok tedu@

1 files changed, 2 insertions, 12 deletions

diff --git a/src/lib/libssl/ssl_txt.c b/src/lib/libssl/ssl_txt.c
index 91664ffe43..5538c57562 100644
--- a/src/lib/libssl/ssl_txt.c
+++ b/src/lib/libssl/ssl_txt.c
@@ -161,16 +161,6 @@ SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
                 if (BIO_printf(bp, "%02X", x->master_key[i])
                         <= 0) goto err;
         }
-        if (BIO_puts(bp, "\n    Key-Arg   : ")
-                <= 0) goto err;
-        if (x->key_arg_length == 0) {
-                if (BIO_puts(bp, "None")
-                        <= 0) goto err;
-        } else
-                for (i = 0; i < x->key_arg_length; i++) {
-                if (BIO_printf(bp, "%02X", x->key_arg[i])
-                        <= 0) goto err;
-        }
 #ifndef OPENSSL_NO_KRB5
         if (BIO_puts(bp, "\n    Krb5 Principal: ")
                 <= 0) goto err;
@@ -227,8 +217,8 @@ SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
                         }
         }
 #endif
-        if (x->time != 0L) {
-                if (BIO_printf(bp, "\n    Start Time: %ld", x->time)
+        if (x->time != 0) {
+                if (BIO_printf(bp, "\n    Start Time: %lld", (long long)x->time)
                         <= 0) goto err;
         }
         if (x->timeout != 0L) {