summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorjsing <>2016-11-17 15:06:22 +0000
committerjsing <>2016-11-17 15:06:22 +0000
commitd6caefed0c7b02fb889999d13b628d13e0ca4512 (patch)
treee4cba53f8f8414c20e41747e83bbd60db30eb0ce /src/lib
parent922da778c547aca7b016abc727670321d5df6d46 (diff)
downloadopenbsd-d6caefed0c7b02fb889999d13b628d13e0ca4512.tar.gz
openbsd-d6caefed0c7b02fb889999d13b628d13e0ca4512.tar.bz2
openbsd-d6caefed0c7b02fb889999d13b628d13e0ca4512.zip
Use defines instead of magic numbers and comments.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/s3_pkt.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/libssl/s3_pkt.c b/src/lib/libssl/s3_pkt.c
index 8d4212d4a1..20e66a707c 100644
--- a/src/lib/libssl/s3_pkt.c
+++ b/src/lib/libssl/s3_pkt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_pkt.c,v 1.59 2016/11/03 16:23:30 jsing Exp $ */ 1/* $OpenBSD: s3_pkt.c,v 1.60 2016/11/17 15:06:22 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1123,8 +1123,7 @@ start:
1123 cb(s, SSL_CB_READ_ALERT, j); 1123 cb(s, SSL_CB_READ_ALERT, j);
1124 } 1124 }
1125 1125
1126 if (alert_level == 1) { 1126 if (alert_level == SSL3_AL_WARNING) {
1127 /* warning */
1128 s->s3->warn_alert = alert_descr; 1127 s->s3->warn_alert = alert_descr;
1129 if (alert_descr == SSL_AD_CLOSE_NOTIFY) { 1128 if (alert_descr == SSL_AD_CLOSE_NOTIFY) {
1130 s->shutdown |= SSL_RECEIVED_SHUTDOWN; 1129 s->shutdown |= SSL_RECEIVED_SHUTDOWN;
@@ -1145,8 +1144,7 @@ start:
1145 SSL_R_NO_RENEGOTIATION); 1144 SSL_R_NO_RENEGOTIATION);
1146 goto f_err; 1145 goto f_err;
1147 } 1146 }
1148 } else if (alert_level == 2) { 1147 } else if (alert_level == SSL3_AL_FATAL) {
1149 /* fatal */
1150 s->rwstate = SSL_NOTHING; 1148 s->rwstate = SSL_NOTHING;
1151 s->s3->fatal_alert = alert_descr; 1149 s->s3->fatal_alert = alert_descr;
1152 SSLerr(SSL_F_SSL3_READ_BYTES, 1150 SSLerr(SSL_F_SSL3_READ_BYTES,