WARNING! GitLab maintenance operation scheduled for this Friday between 14:00 and 19:00 (CET). During this time window, GitLab will be unavailable, and any data entered during this period may be lost. Thank you in advance for your understanding.

Commit f9a21ed0 authored Mar 04, 2015 by Kurt Cancemi Committed by Matt Caswell Mar 05, 2015

Use constants not numbers



This patch uses warning/fatal constants instead of numbers with comments for
warning/alerts in d1_pkt.c and s3_pkt.c

RT#3725

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit fd865cad)

parent d6b4a41d

ssl/d1_pkt.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1142,7 +1142,7 @@ int dtls1_read_bytes(SSL s, int type, unsigned char buf, int len, int peek)
		cb(s, SSL_CB_READ_ALERT, j);
		}

		if (alert_level == 1) { /* warning */
		if (alert_level == SSL3_AL_WARNING) {
		s->s3->warn_alert = alert_descr;
		if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
		#ifndef OPENSSL_NO_SCTP
		@@ -1191,7 +1191,7 @@ int dtls1_read_bytes(SSL s, int type, unsigned char buf, int len, int peek)
		}
		}
		#endif
		} else if (alert_level == 2) { /* fatal */
		} else if (alert_level == SSL3_AL_FATAL) {
		char tmp[16];

		s->rwstate = SSL_NOTHING;

ssl/s3_pkt.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1430,7 +1430,7 @@ int ssl3_read_bytes(SSL s, int type, unsigned char buf, int len, int peek)
		cb(s, SSL_CB_READ_ALERT, j);
		}

		if (alert_level == 1) { /* warning */
		if (alert_level == SSL3_AL_WARNING) {
		s->s3->warn_alert = alert_descr;
		if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
		s->shutdown \|= SSL_RECEIVED_SHUTDOWN;
		@@ -1453,7 +1453,7 @@ int ssl3_read_bytes(SSL s, int type, unsigned char buf, int len, int peek)
		else if (alert_descr == SSL_AD_MISSING_SRP_USERNAME)
		return (0);
		#endif
		} else if (alert_level == 2) { /* fatal */
		} else if (alert_level == SSL3_AL_FATAL) {
		char tmp[16];

		s->rwstate = SSL_NOTHING;