From: Nils Larsch <nils@openssl.org>
Date: Fri, 1 Apr 2005 17:33:39 +0000 (+0000)
Subject: use SSL3_VERSION_MAJOR instead of SSL3_VERSION etc.
X-Git-Tag: OpenSSL_0_9_7g~15
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=62a25c6129a2205ebb231b51cd76d65b8f779c38;p=oweals%2Fopenssl.git

use SSL3_VERSION_MAJOR instead of SSL3_VERSION etc.

PR: 658
---

diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index 27c4b86ed4..4d5900ad2f 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -266,7 +266,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char * const *pp,
 			((unsigned long)os.data[1]<< 8L)|
 			 (unsigned long)os.data[2];
 		}
-	else if ((ssl_version>>8) == 3)
+	else if ((ssl_version>>8) == SSL3_VERSION_MAJOR)
 		{
 		if (os.length != 2)
 			{
@@ -287,9 +287,9 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char * const *pp,
 	ret->cipher_id=id;
 
 	M_ASN1_D2I_get(osp,d2i_ASN1_OCTET_STRING);
-	if ((ssl_version>>8) == SSL3_VERSION)
+	if ((ssl_version>>8) == SSL3_VERSION_MAJOR)
 		i=SSL3_MAX_SSL_SESSION_ID_LENGTH;
-	else /* if (ssl_version == SSL2_VERSION) */
+	else /* if (ssl_version == SSL2_VERSION_MAJOR) */
 		i=SSL2_MAX_SSL_SESSION_ID_LENGTH;
 
 	if (os.length > i)