X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Fssl_txt.c;h=26dee73bfaaa0ead803786290d2f0a2857f2446b;hb=ec0bfca7e771e08a09c0be307ec56427e0f8461b;hp=ca67a98d896a61081d92811232cf3a5db9e12bec;hpb=b1c4fe36258dde2950f59fec5d5f86743e495d9d;p=oweals%2Fopenssl.git

diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c
index ca67a98d89..26dee73bfa 100644
--- a/ssl/ssl_txt.c
+++ b/ssl/ssl_txt.c
@@ -55,13 +55,39 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
+/* ====================================================================
+ * Copyright 2005 Nokia. All rights reserved.
+ *
+ * The portions of the attached software ("Contribution") is developed by
+ * Nokia Corporation and is licensed pursuant to the OpenSSL open source
+ * license.
+ *
+ * The Contribution, originally written by Mika Kousa and Pasi Eronen of
+ * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
+ * support (see RFC 4279) to OpenSSL.
+ *
+ * No patent licenses or other rights except those expressly stated in
+ * the OpenSSL open source license shall be deemed granted or received
+ * expressly, by implication, estoppel, or otherwise.
+ *
+ * No assurances are provided by Nokia that the Contribution does not
+ * infringe the patent or other intellectual property rights of any third
+ * party or that the license provides you with all the necessary rights
+ * to make use of the Contribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
+ * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
+ * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
+ * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
+ * OTHERWISE.
+ */
 
 #include <stdio.h>
 #include <openssl/buffer.h>
 #include "ssl_locl.h"
 
-#ifndef NO_FP_API
-int SSL_SESSION_print_fp(FILE *fp, SSL_SESSION *x)
+#ifndef OPENSSL_NO_FP_API
+int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x)
 	{
 	BIO *b;
 	int ret;
@@ -78,10 +104,10 @@ int SSL_SESSION_print_fp(FILE *fp, SSL_SESSION *x)
 	}
 #endif
 
-int SSL_SESSION_print(BIO *bp, SSL_SESSION *x)
+int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
 	{
 	unsigned int i;
-	char str[128],*s;
+	const char *s;
 
 	if (x == NULL) goto err;
 	if (BIO_puts(bp,"SSL-Session:\n") <= 0) goto err;
@@ -93,36 +119,41 @@ int SSL_SESSION_print(BIO *bp, SSL_SESSION *x)
 		s="TLSv1";
 	else
 		s="unknown";
-	sprintf(str,"    Protocol  : %s\n",s);
-	if (BIO_puts(bp,str) <= 0) goto err;
+	if (BIO_printf(bp,"    Protocol  : %s\n",s) <= 0) goto err;
 
 	if (x->cipher == NULL)
 		{
 		if (((x->cipher_id) & 0xff000000) == 0x02000000)
-			sprintf(str,"    Cipher    : %06lX\n",x->cipher_id&0xffffff);
+			{
+			if (BIO_printf(bp,"    Cipher    : %06lX\n",x->cipher_id&0xffffff) <= 0)
+				goto err;
+			}
 		else
-			sprintf(str,"    Cipher    : %04lX\n",x->cipher_id&0xffff);
+			{
+			if (BIO_printf(bp,"    Cipher    : %04lX\n",x->cipher_id&0xffff) <= 0)
+				goto err;
+			}
 		}
 	else
-		sprintf(str,"    Cipher    : %s\n",(x->cipher == NULL)?"unknown":x->cipher->name);
-	if (BIO_puts(bp,str) <= 0) goto err;
+		{
+		if (BIO_printf(bp,"    Cipher    : %s\n",((x->cipher == NULL)?"unknown":x->cipher->name)) <= 0)
+			goto err;
+		}
 	if (BIO_puts(bp,"    Session-ID: ") <= 0) goto err;
 	for (i=0; i<x->session_id_length; i++)
 		{
-		sprintf(str,"%02X",x->session_id[i]);
-		if (BIO_puts(bp,str) <= 0) goto err;
+		if (BIO_printf(bp,"%02X",x->session_id[i]) <= 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]);
-		if (BIO_puts(bp,str) <= 0) goto err;
+		if (BIO_printf(bp,"%02X",x->sid_ctx[i]) <= 0)
+			goto err;
 		}
 	if (BIO_puts(bp,"\n    Master-Key: ") <= 0) goto err;
 	for (i=0; i<(unsigned int)x->master_key_length; i++)
 		{
-		sprintf(str,"%02X",x->master_key[i]);
-		if (BIO_puts(bp,str) <= 0) goto err;
+		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)
@@ -132,37 +163,71 @@ int SSL_SESSION_print(BIO *bp, SSL_SESSION *x)
 	else
 		for (i=0; i<x->key_arg_length; i++)
 			{
-			sprintf(str,"%02X",x->key_arg[i]);
-			if (BIO_puts(bp,str) <= 0) goto err;
+			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;
+            if (x->krb5_client_princ_len == 0)
+            {
+		if (BIO_puts(bp,"None") <= 0) goto err;
+		}
+	else
+		for (i=0; i<x->krb5_client_princ_len; i++)
+			{
+			if (BIO_printf(bp,"%02X",x->krb5_client_princ[i]) <= 0) goto err;
 			}
+#endif /* OPENSSL_NO_KRB5 */
+#ifndef OPENSSL_NO_PSK
+	if (BIO_puts(bp,"\n    PSK identity: ") <= 0) goto err;
+	if (BIO_printf(bp, "%s", x->psk_identity ? x->psk_identity : "None") <= 0) goto err;
+	if (BIO_puts(bp,"\n    PSK identity hint: ") <= 0) goto err;
+	if (BIO_printf(bp, "%s", x->psk_identity_hint ? x->psk_identity_hint : "None") <= 0) goto err;
+#endif
+#ifndef OPENSSL_NO_TLSEXT
+	if (x->tlsext_tick_lifetime_hint)
+		{
+		if (BIO_printf(bp,
+			"\n    TLS session ticket lifetime hint: %ld (seconds)",
+			x->tlsext_tick_lifetime_hint) <=0)
+			goto err;
+		}
+	if (x->tlsext_tick)
+		{
+		if (BIO_puts(bp, "\n    TLS session ticket:\n") <= 0) goto err;
+		if (BIO_dump_indent(bp, (char *)x->tlsext_tick, x->tlsext_ticklen, 4) <= 0)
+			goto err;
+		}
+#endif
+
+#ifndef OPENSSL_NO_COMP
 	if (x->compress_meth != 0)
 		{
-		SSL_COMP *comp;
+		SSL_COMP *comp = NULL;
 
-		ssl_cipher_get_evp(x,NULL,NULL,&comp);
+		ssl_cipher_get_evp(x,NULL,NULL,NULL,NULL,&comp);
 		if (comp == NULL)
 			{
-			sprintf(str,"\n   Compression: %d",x->compress_meth);
-			if (BIO_puts(bp,str) <= 0) goto err;
+			if (BIO_printf(bp,"\n   Compression: %d",x->compress_meth) <= 0) goto err;
 			}
 		else
 			{
-			sprintf(str,"\n   Compression: %d (%s)",
-				comp->id,comp->method->name);
-			if (BIO_puts(bp,str) <= 0) goto err;
+			if (BIO_printf(bp,"\n   Compression: %d (%s)", comp->id,comp->method->name) <= 0) goto err;
 			}
 		}	
+#endif
 	if (x->time != 0L)
 		{
-		sprintf(str,"\n    Start Time: %ld",x->time);
-		if (BIO_puts(bp,str) <= 0) goto err;
+		if (BIO_printf(bp, "\n    Start Time: %ld",x->time) <= 0) goto err;
 		}
 	if (x->timeout != 0L)
 		{
-		sprintf(str,"\n    Timeout   : %ld (sec)",x->timeout);
-		if (BIO_puts(bp,str) <= 0) goto err;
+		if (BIO_printf(bp, "\n    Timeout   : %ld (sec)",x->timeout) <= 0) goto err;
 		}
 	if (BIO_puts(bp,"\n") <= 0) goto err;
+
+	if (BIO_puts(bp, "    Verify return code: ") <= 0) goto err;
+	if (BIO_printf(bp, "%ld (%s)\n", x->verify_result,
+		X509_verify_cert_error_string(x->verify_result)) <= 0) goto err;
 		
 	return(1);
 err: