ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/tls_openssl.c

Comparing ircd-hybrid/trunk/src/tls_openssl.c (file contents):
Revision 7123 by michael, Sat Jan 23 20:25:03 2016 UTC vs.
Revision 7124 by michael, Sun Jan 24 20:28:46 2016 UTC

#	Line 151 | Line 151 | tls_new_cred(void)
151		}
152
153		#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
154	<	if (ConfigServerInfo.ssl_dh_elliptic_curve != NULL)
154	>	if (ConfigServerInfo.ssl_dh_elliptic_curve)
155		{
156		int nid = 0;
157		EC_KEY *key = NULL;
#	Line 182 | Line 182 | set_default_curve:
182		#endif
183
184		if (ConfigServerInfo.ssl_message_digest_algorithm == NULL)
185	–	{
185		ConfigServerInfo.message_digest_algorithm = EVP_sha256();
187	–	}
186		else
187		{
188		ConfigServerInfo.message_digest_algorithm = EVP_get_digestbyname(ConfigServerInfo.ssl_message_digest_algorithm);
189	+
190		if (ConfigServerInfo.message_digest_algorithm == NULL)
191		{
192		ConfigServerInfo.message_digest_algorithm = EVP_sha256();
#	Line 216 | Line 215 | int
215		tls_isusing(tls_data_t *tls_data)
216		{
217		SSL *ssl = *tls_data;
218	<	return (ssl != NULL);
218	>	return ssl != NULL;
219		}
220
221		void

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)