- deraadt@cvs.openbsd.org 2006/03/20 17:10:19

     [auth.c key.c misc.c packet.c ssh-add.c]
     in a switch (), break after return or goto is stupid

diff --git a/ChangeLog b/ChangeLog
index acdd50d1635987a4f8ff4698da30a0da9f495b15..a26fdce994fca90581d5f7673d9f2e7edd2c21c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,6 +65,9 @@
      [key.c]
      (really) last of the Coverity diffs: avoid possible NULL deref in
      key_free. via elad AT netbsd.org; markus@ ok
+   - deraadt@cvs.openbsd.org 2006/03/20 17:10:19
+     [auth.c key.c misc.c packet.c ssh-add.c]
+     in a switch (), break after return or goto is stupid
 
 20060325
  - OpenBSD CVS Sync

diff --git a/auth.c b/auth.c
index 35bc5ea1dc311b9f8ebcd49aa144a45c5122f9a7..85c6f8d1d31338d7224481ebc362b4874afa2c81 100644 (file)
--- a/auth.c
+++ b/auth.c
@@ -314,7 +314,6 @@ auth_root_allowed(char *method)
        switch (options.permit_root_login) {
        case PERMIT_YES:
                return 1;
-               break;
        case PERMIT_NO_PASSWD:
                if (strcmp(method, "password") != 0)
                        return 1;

diff --git a/key.c b/key.c
index 283aea99ebdda3e29bcb36a89bb6d2f3286495ca..96619fe60e2d59e5d576dcd57476cda27ea00c16 100644 (file)
--- a/key.c
+++ b/key.c
@@ -156,14 +156,12 @@ key_equal(const Key *a, const Key *b)
                return a->rsa != NULL && b->rsa != NULL &&
                    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
                    BN_cmp(a->rsa->n, b->rsa->n) == 0;
-               break;
        case KEY_DSA:
                return a->dsa != NULL && b->dsa != NULL &&
                    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
                    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
                    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
                    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
-               break;
        default:
                fatal("key_equal: bad key type %d", a->type);
                break;
@@ -210,7 +208,6 @@ key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
                break;
        case KEY_UNSPEC:
                return retval;
-               break;
        default:
                fatal("key_fingerprint_raw: bad key type %d", k->type);
                break;
@@ -531,13 +528,10 @@ key_type(const Key *k)
        switch (k->type) {
        case KEY_RSA1:
                return "RSA1";
-               break;
        case KEY_RSA:
                return "RSA";
-               break;
        case KEY_DSA:
                return "DSA";
-               break;
        }
        return "unknown";
 }
@@ -548,10 +542,8 @@ key_ssh_name(const Key *k)
        switch (k->type) {
        case KEY_RSA:
                return "ssh-rsa";
-               break;
        case KEY_DSA:
                return "ssh-dss";
-               break;
        }
        return "ssh-unknown";
 }
@@ -563,10 +555,8 @@ key_size(const Key *k)
        case KEY_RSA1:
        case KEY_RSA:
                return BN_num_bits(k->rsa->n);
-               break;
        case KEY_DSA:
                return BN_num_bits(k->dsa->p);
-               break;
        }
        return 0;
 }
@@ -575,6 +565,7 @@ static RSA *
 rsa_generate_private_key(u_int bits)
 {
        RSA *private;
+
        private = RSA_generate_key(bits, 35, NULL, NULL);
        if (private == NULL)
                fatal("rsa_generate_private_key: key generation failed.");
@@ -585,6 +576,7 @@ static DSA*
 dsa_generate_private_key(u_int bits)
 {
        DSA *private = DSA_generate_parameters(bits, NULL, 0, NULL, NULL, NULL, NULL);
+
        if (private == NULL)
                fatal("dsa_generate_private_key: DSA_generate_parameters failed");
        if (!DSA_generate_key(private))
@@ -794,14 +786,11 @@ key_sign(
        switch (key->type) {
        case KEY_DSA:
                return ssh_dss_sign(key, sigp, lenp, data, datalen);
-               break;
        case KEY_RSA:
                return ssh_rsa_sign(key, sigp, lenp, data, datalen);
-               break;
        default:
                error("key_sign: invalid key type %d", key->type);
                return -1;
-               break;
        }
 }
 
@@ -821,14 +810,11 @@ key_verify(
        switch (key->type) {
        case KEY_DSA:
                return ssh_dss_verify(key, signature, signaturelen, data, datalen);
-               break;
        case KEY_RSA:
                return ssh_rsa_verify(key, signature, signaturelen, data, datalen);
-               break;
        default:
                error("key_verify: invalid key type %d", key->type);
                return -1;
-               break;
        }
 }
 

diff --git a/misc.c b/misc.c
index 66b762b5a06f7ffa82fa4ca99096dfded5db02ca..1949dd4b372e80363df55e284d60efbe8a61da92 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -297,6 +297,7 @@ convtime(const char *s)
                switch (*endp++) {
                case '\0':
                        endp--;
+                       break;
                case 's':
                case 'S':
                        break;

diff --git a/packet.c b/packet.c
index a1e7d32f677a54e77183568a9cb6b5a3596c99da..65fb31d2e0ff2f6d6c6e55707568ec145e1d2852 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -1188,7 +1188,6 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
                                break;
                        default:
                                return type;
-                               break;
                        }
                } else {
                        type = packet_read_poll1();
@@ -1211,7 +1210,6 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
                                if (type)
                                        DBG(debug("received packet type %d", type));
                                return type;
-                               break;
                        }
                }
        }

diff --git a/ssh-add.c b/ssh-add.c
index 4c5cc57277769b6914790d49b7e9ff112622137c..2944cceebe824f4bbf924b8debfee6dc124f6152 100644 (file)
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -346,13 +346,11 @@ main(int argc, char **argv)
                        if (list_identities(ac, ch == 'l' ? 1 : 0) == -1)
                                ret = 1;
                        goto done;
-                       break;
                case 'x':
                case 'X':
                        if (lock_agent(ac, ch == 'x' ? 1 : 0) == -1)
                                ret = 1;
                        goto done;
-                       break;
                case 'c':
                        confirm = 1;
                        break;
@@ -363,7 +361,6 @@ main(int argc, char **argv)
                        if (delete_all(ac) == -1)
                                ret = 1;
                        goto done;
-                       break;
                case 's':
                        sc_reader_id = optarg;
                        break;