GH480: Don't break statements with CPP stuff.

This is also RT 4137

Signed-off-by: Rich Salz <rsalz@akamai.com>
Reviewed-by: Andy Polyakov <appro@openssl.org>

diff --git a/apps/req.c b/apps/req.c
index facc63967d7e00143e205519ca819673acfcdce7..28ed03679457ab8e9ebf482b396c1b620e7a0dbc 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -1120,7 +1120,7 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
                      STACK_OF(CONF_VALUE) *attr_sk, int attribs,
                      unsigned long chtype)
 {
                      STACK_OF(CONF_VALUE) *attr_sk, int attribs,
                      unsigned long chtype)
 {

-    int i;
+    int i, spec_char, plus_char;

     char *p, *q;
     char *type;
     CONF_VALUE *v;
     char *p, *q;
     char *type;
     CONF_VALUE *v;


@@ -1136,24 +1136,26 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
         /*
          * Skip past any leading X. X: X, etc to allow for multiple instances
          */
         /*
          * Skip past any leading X. X: X, etc to allow for multiple instances
          */

-        for (p = v->name; *p; p++)
+        for (p = v->name; *p; p++) {

 #ifndef CHARSET_EBCDIC
 #ifndef CHARSET_EBCDIC

-            if ((*p == ':') || (*p == ',') || (*p == '.')) {
+            spec_char = ((*p == ':') || (*p == ',') || (*p == '.'));

 #else
 #else

-            if ((*p == os_toascii[':']) || (*p == os_toascii[','])
-                || (*p == os_toascii['.'])) {
+            spec_char = ((*p == os_toascii[':']) || (*p == os_toascii[','])
+                    || (*p == os_toascii['.']));

 #endif
 #endif

+            if (spec_char) {

                 p++;
                 if (*p)
                     type = p;
                 break;
             }
                 p++;
                 if (*p)
                     type = p;
                 break;
             }

+        }

 #ifndef CHARSET_EBCDIC
 #ifndef CHARSET_EBCDIC

-        if (*p == '+')
+        plus_char = (*p == '+');

 #else
 #else

-        if (*p == os_toascii['+'])
+        plus_char = (*p == os_toascii['+']);

 #endif
 #endif

-        {
+        if (plus_char) {

             p++;
             mval = -1;
         } else
             p++;
             mval = -1;
         } else

diff --git a/apps/s_server.c b/apps/s_server.c
index 074c7634c7e3eaed49ca1c7babbd0dc5db510732..138062848301f7c8dfaf7feb7b92cc9972e5554b 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1892,8 +1892,7 @@ int s_server_main(int argc, char *argv[])
                                                        not_resumable_sess_cb);
     }
 #ifndef OPENSSL_NO_PSK
                                                        not_resumable_sess_cb);
     }
 #ifndef OPENSSL_NO_PSK

-    if (psk_key != NULL)
-    {
+    if (psk_key != NULL) {

         if (s_debug)
             BIO_printf(bio_s_out,
                        "PSK key given, setting server callback\n");
         if (s_debug)
             BIO_printf(bio_s_out,
                        "PSK key given, setting server callback\n");

diff --git a/crypto/asn1/f_string.c b/crypto/asn1/f_string.c
index 048f92a5fbf35e869beb34d5a4ee419dc01c440f..7d9eb1475aca9719ab2d20dfdd8c7cfe2cc9016f 100644 (file)
--- a/crypto/asn1/f_string.c
+++ b/crypto/asn1/f_string.c
@@ -94,7 +94,7 @@ int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type)
 
 int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
 {
 
 int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
 {

-    int i, j, k, m, n, again, bufsize;
+    int i, j, k, m, n, again, bufsize, spec_char;

     unsigned char *s = NULL, *sp;
     unsigned char *bufp;
     int num = 0, slen = 0, first = 1;
     unsigned char *s = NULL, *sp;
     unsigned char *bufp;
     int num = 0, slen = 0, first = 1;


@@ -122,18 +122,18 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
 
         for (j = i - 1; j > 0; j--) {
 #ifndef CHARSET_EBCDIC
 
         for (j = i - 1; j > 0; j--) {
 #ifndef CHARSET_EBCDIC

-            if (!(((buf[j] >= '0') && (buf[j] <= '9')) ||
+            spec_char = (!(((buf[j] >= '0') && (buf[j] <= '9')) ||

                   ((buf[j] >= 'a') && (buf[j] <= 'f')) ||
                   ((buf[j] >= 'a') && (buf[j] <= 'f')) ||

-                  ((buf[j] >= 'A') && (buf[j] <= 'F'))))
+                  ((buf[j] >= 'A') && (buf[j] <= 'F'))));

 #else
             /*
              * This #ifdef is not strictly necessary, since the characters
              * A...F a...f 0...9 are contiguous (yes, even in EBCDIC - but
              * not the whole alphabet). Nevertheless, isxdigit() is faster.
              */
 #else
             /*
              * This #ifdef is not strictly necessary, since the characters
              * A...F a...f 0...9 are contiguous (yes, even in EBCDIC - but
              * not the whole alphabet). Nevertheless, isxdigit() is faster.
              */

-            if (!isxdigit(buf[j]))
+            spec_char = (!isxdigit(buf[j]));

 #endif
 #endif

-            {
+            if (spec_char) {

                 i = j;
                 break;
             }
                 i = j;
                 break;
             }

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 0887293e2969b15893c5f28abf8c48f35f3f15f3..36d40755fb3bfe49bfd13a11698edb69e7dce12e 100644 (file)
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -458,6 +458,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
     int *ip;
     bio_dgram_data *data = NULL;
     int sockopt_val = 0;
     int *ip;
     bio_dgram_data *data = NULL;
     int sockopt_val = 0;

+    int d_errno;

 # if defined(OPENSSL_SYS_LINUX) && (defined(IP_MTU_DISCOVER) || defined(IP_MTU))
     socklen_t sockopt_len;      /* assume that system supporting IP_MTU is
                                  * modern enough to define socklen_t */
 # if defined(OPENSSL_SYS_LINUX) && (defined(IP_MTU_DISCOVER) || defined(IP_MTU))
     socklen_t sockopt_len;      /* assume that system supporting IP_MTU is
                                  * modern enough to define socklen_t */


@@ -760,11 +761,11 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
         /* fall-through */
     case BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP:
 # ifdef OPENSSL_SYS_WINDOWS
         /* fall-through */
     case BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP:
 # ifdef OPENSSL_SYS_WINDOWS

-        if (data->_errno == WSAETIMEDOUT)
+        d_errno = (data->_errno == WSAETIMEDOUT);

 # else
 # else

-        if (data->_errno == EAGAIN)
+        d_errno = (data->_errno == EAGAIN);

 # endif
 # endif

-        {
+        if (d_errno) {

             ret = 1;
             data->_errno = 0;
         } else
             ret = 1;
             data->_errno = 0;
         } else

diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c
index 29a375d4ed8543408bd21fca2a1fbf01e07aaaba..66b5711aff928697bca033596add7596c21ea209 100644 (file)
--- a/crypto/x509v3/v3_utl.c
+++ b/crypto/x509v3/v3_utl.c
@@ -1303,7 +1303,7 @@ int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
                              unsigned long chtype)
 {
     CONF_VALUE *v;
                              unsigned long chtype)
 {
     CONF_VALUE *v;

-    int i, mval;
+    int i, mval, spec_char, plus_char;

     char *p, *type;
     if (!nm)
         return 0;
     char *p, *type;
     if (!nm)
         return 0;


@@ -1314,25 +1314,26 @@ int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
         /*
          * Skip past any leading X. X: X, etc to allow for multiple instances
          */
         /*
          * Skip past any leading X. X: X, etc to allow for multiple instances
          */

-        for (p = type; *p; p++)
+        for (p = type; *p; p++) {

 #ifndef CHARSET_EBCDIC
 #ifndef CHARSET_EBCDIC

-            if ((*p == ':') || (*p == ',') || (*p == '.'))
+            spec_char = ((*p == ':') || (*p == ',') || (*p == '.'));

 #else
 #else

-            if ((*p == os_toascii[':']) || (*p == os_toascii[','])
-                || (*p == os_toascii['.']))
+            spec_char = ((*p == os_toascii[':']) || (*p == os_toascii[','])
+                    || (*p == os_toascii['.']));

 #endif
 #endif

-            {
+            if (spec_char) {

                 p++;
                 if (*p)
                     type = p;
                 break;
             }
                 p++;
                 if (*p)
                     type = p;
                 break;
             }

+        }

 #ifndef CHARSET_EBCDIC
 #ifndef CHARSET_EBCDIC

-        if (*type == '+')
+        plus_char = (*type == '+');

 #else
 #else

-        if (*type == os_toascii['+'])
+        plus_char = (*type == os_toascii['+']);

 #endif
 #endif

-        {
+        if (plus_char) {

             mval = -1;
             type++;
         } else
             mval = -1;
             type++;
         } else