[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  fd865cadcb603918bdcfcf44e487721c657a1117 (commit)
      from  918bb8652969fd53f0c390c1cd909265ed502c7e (commit)


- Log -----------------------------------------------------------------
commit fd865cadcb603918bdcfcf44e487721c657a1117
Author: Kurt Cancemi <kurt at x64architecture.com>
Date:   Wed Mar 4 10:57:45 2015 +0000

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/d1_pkt.c | 4 ++--
 ssl/s3_pkt.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index d66ecf5..b1d9156 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -1088,7 +1088,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
@@ -1137,7 +1137,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;
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index f54152e..66fa9d1 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -1451,7 +1451,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;
@@ -1474,7 +1474,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;