From 2e22f5e2e00c1f1f599b03634ca27bb5b9ac471e Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 6 Jun 2014 20:59:29 +0000
Subject: Import OpenSSL 1.0.1h.

Approved by:	so (delphij)
---
 ssl/ssl_lib.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ssl/ssl_lib.c')

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 6dbc3c1f7d0a..ef6258ca9f06 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1349,6 +1349,10 @@ char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len)
 
 	p=buf;
 	sk=s->session->ciphers;
+
+	if (sk_SSL_CIPHER_num(sk) == 0)
+		return NULL;
+
 	for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
 		{
 		int n;
-- 
cgit v1.2.3