Browse Source

Remove goto inside an if(0) block

There were a dozen-plus instances of this construct:
   if (0) { label: ..... }

Reviewed-by: Tim Hudson <tjh@openssl.org>
master
Rich Salz 7 years ago
parent
commit
666964780a
14 changed files with 82 additions and 105 deletions
  1. +11
    -14
      crypto/asn1/f_enum.c
  2. +9
    -13
      crypto/asn1/f_int.c
  3. +11
    -14
      crypto/asn1/f_string.c
  4. +5
    -6
      crypto/asn1/t_x509.c
  5. +6
    -6
      crypto/dh/dh_ameth.c
  6. +5
    -5
      crypto/x509/x509_vfy.c
  7. +3
    -3
      crypto/x509v3/pcy_cache.c
  8. +8
    -9
      demos/bio/sconnect.c
  9. +7
    -7
      ssl/s3_clnt.c
  10. +0
    -1
      ssl/s3_lib.c
  11. +8
    -10
      ssl/s3_srvr.c
  12. +0
    -4
      ssl/ssl_asn1.c
  13. +6
    -8
      ssl/ssl_cert.c
  14. +3
    -5
      ssl/ssl_lib.c

+ 11
- 14
crypto/asn1/f_enum.c View File

@ -97,7 +97,6 @@ int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a)
int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size)
{
int ret = 0;
int i, j, k, m, n, again, bufsize;
unsigned char *s = NULL, *sp;
unsigned char *bufp;
@ -108,16 +107,16 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size)
bufsize = BIO_gets(bp, buf, size);
for (;;) {
if (bufsize < 1)
goto err_sl;
goto err;
i = bufsize;
if (buf[i - 1] == '\n')
buf[--i] = '\0';
if (i == 0)
goto err_sl;
goto err;
if (buf[i - 1] == '\r')
buf[--i] = '\0';
if (i == 0)
goto err_sl;
goto err;
again = (buf[i - 1] == '\\');
for (j = 0; j < i; j++) {
@ -133,7 +132,7 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size)
* We have now cleared all the crap off the end of the line
*/
if (i < 2)
goto err_sl;
goto err;
bufp = (unsigned char *)buf;
if (first) {
@ -147,7 +146,7 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size)
i -= again;
if (i % 2 != 0) {
ASN1err(ASN1_F_A2I_ASN1_ENUMERATED, ASN1_R_ODD_NUMBER_OF_CHARS);
goto err;
return 0;
}
i /= 2;
if (num + i > slen) {
@ -155,7 +154,7 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size)
if (sp == NULL) {
ASN1err(ASN1_F_A2I_ASN1_ENUMERATED, ERR_R_MALLOC_FAILURE);
OPENSSL_free(s);
goto err;
return 0;
}
s = sp;
slen = num + i * 2;
@ -172,7 +171,7 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size)
else {
ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,
ASN1_R_NON_HEX_CHARACTERS);
goto err;
return 0;
}
s[num + j] <<= 4;
s[num + j] |= m;
@ -186,11 +185,9 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size)
}
bs->length = num;
bs->data = s;
ret = 1;
return 1;
err:
if (0) {
err_sl:
ASN1err(ASN1_F_A2I_ASN1_ENUMERATED, ASN1_R_SHORT_LINE);
}
return (ret);
ASN1err(ASN1_F_A2I_ASN1_ENUMERATED, ASN1_R_SHORT_LINE);
return 0;
}

+ 9
- 13
crypto/asn1/f_int.c View File

@ -101,7 +101,6 @@ int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a)
int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size)
{
int ret = 0;
int i, j, k, m, n, again, bufsize;
unsigned char *s = NULL, *sp;
unsigned char *bufp;
@ -112,16 +111,16 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size)
bufsize = BIO_gets(bp, buf, size);
for (;;) {
if (bufsize < 1)
goto err_sl;
goto err;
i = bufsize;
if (buf[i - 1] == '\n')
buf[--i] = '\0';
if (i == 0)
goto err_sl;
goto err;
if (buf[i - 1] == '\r')
buf[--i] = '\0';
if (i == 0)
goto err_sl;
goto err;
again = (buf[i - 1] == '\\');
for (j = 0; j < i; j++) {
@ -147,7 +146,7 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size)
* We have now cleared all the crap off the end of the line
*/
if (i < 2)
goto err_sl;
goto err;
bufp = (unsigned char *)buf;
if (first) {
@ -161,7 +160,7 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size)
i -= again;
if (i % 2 != 0) {
ASN1err(ASN1_F_A2I_ASN1_INTEGER, ASN1_R_ODD_NUMBER_OF_CHARS);
goto err;
return 0;
}
i /= 2;
if (num + i > slen) {
@ -169,7 +168,7 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size)
if (sp == NULL) {
ASN1err(ASN1_F_A2I_ASN1_INTEGER, ERR_R_MALLOC_FAILURE);
OPENSSL_free(s);
goto err;
return 0;
}
s = sp;
slen = num + i * 2;
@ -200,11 +199,8 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size)
}
bs->length = num;
bs->data = s;
ret = 1;
return 1;
err:
if (0) {
err_sl:
ASN1err(ASN1_F_A2I_ASN1_INTEGER, ASN1_R_SHORT_LINE);
}
return (ret);
ASN1err(ASN1_F_A2I_ASN1_INTEGER, ASN1_R_SHORT_LINE);
return 0;
}

+ 11
- 14
crypto/asn1/f_string.c View File

@ -95,7 +95,6 @@ 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 ret = 0;
int i, j, k, m, n, again, bufsize;
unsigned char *s = NULL, *sp;
unsigned char *bufp;
@ -107,7 +106,7 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
if (first)
break;
else
goto err_sl;
goto err;
}
first = 0;
@ -115,11 +114,11 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
if (buf[i - 1] == '\n')
buf[--i] = '\0';
if (i == 0)
goto err_sl;
goto err;
if (buf[i - 1] == '\r')
buf[--i] = '\0';
if (i == 0)
goto err_sl;
goto err;
again = (buf[i - 1] == '\\');
for (j = i - 1; j > 0; j--) {
@ -145,7 +144,7 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
* We have now cleared all the crap off the end of the line
*/
if (i < 2)
goto err_sl;
goto err;
bufp = (unsigned char *)buf;
@ -153,7 +152,7 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
i -= again;
if (i % 2 != 0) {
ASN1err(ASN1_F_A2I_ASN1_STRING, ASN1_R_ODD_NUMBER_OF_CHARS);
goto err;
return 0;
}
i /= 2;
if (num + i > slen) {
@ -161,7 +160,7 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
if (sp == NULL) {
ASN1err(ASN1_F_A2I_ASN1_STRING, ERR_R_MALLOC_FAILURE);
OPENSSL_free(s);
goto err;
return 0;
}
s = sp;
slen = num + i * 2;
@ -178,7 +177,7 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
else {
ASN1err(ASN1_F_A2I_ASN1_STRING,
ASN1_R_NON_HEX_CHARACTERS);
goto err;
return 0;
}
s[num + j] <<= 4;
s[num + j] |= m;
@ -192,11 +191,9 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
}
bs->length = num;
bs->data = s;
ret = 1;
return 1;
err:
if (0) {
err_sl:
ASN1err(ASN1_F_A2I_ASN1_STRING, ASN1_R_SHORT_LINE);
}
return (ret);
ASN1err(ASN1_F_A2I_ASN1_STRING, ASN1_R_SHORT_LINE);
return 0;
}

+ 5
- 6
crypto/asn1/t_x509.c View File

@ -490,7 +490,7 @@ int ASN1_UTCTIME_print(BIO *bp, const ASN1_UTCTIME *tm)
int X509_NAME_print(BIO *bp, X509_NAME *name, int obase)
{
char *s, *c, *b;
int ret = 0, l, i;
int l, i;
l = 80 - 2 - obase;
@ -535,11 +535,10 @@ int X509_NAME_print(BIO *bp, X509_NAME *name, int obase)
l--;
}
ret = 1;
if (0) {
OPENSSL_free(b);
return 1;
err:
X509err(X509_F_X509_NAME_PRINT, ERR_R_BUF_LIB);
}
X509err(X509_F_X509_NAME_PRINT, ERR_R_BUF_LIB);
OPENSSL_free(b);
return (ret);
return 0;
}

+ 6
- 6
crypto/dh/dh_ameth.c View File

@ -327,7 +327,7 @@ static int do_dh_print(BIO *bp, const DH *x, int indent,
ASN1_PCTX *ctx, int ptype)
{
unsigned char *m = NULL;
int reason = ERR_R_BUF_LIB, ret = 0;
int reason = ERR_R_BUF_LIB;
size_t buf_len = 0;
const char *ktype = NULL;
@ -415,13 +415,13 @@ static int do_dh_print(BIO *bp, const DH *x, int indent,
goto err;
}
ret = 1;
if (0) {
OPENSSL_free(m);
return 1;
err:
DHerr(DH_F_DO_DH_PRINT, reason);
}
DHerr(DH_F_DO_DH_PRINT, reason);
OPENSSL_free(m);
return (ret);
return 0;
}
static int int_dh_size(const EVP_PKEY *pkey)


+ 5
- 5
crypto/x509/x509_vfy.c View File

@ -489,12 +489,12 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
/* If we get this far evaluate policies */
if (!bad_chain && (ctx->param->flags & X509_V_FLAG_POLICY_CHECK))
ok = ctx->check_policy(ctx);
if (!ok)
goto end;
if (0) {
if (ok)
goto done;
end:
X509_get_pubkey_parameters(NULL, ctx->chain);
}
X509_get_pubkey_parameters(NULL, ctx->chain);
done:
sk_X509_free(sktmp);
X509_free(chain_ss);
return ok;


+ 3
- 3
crypto/x509v3/pcy_cache.c View File

@ -200,12 +200,12 @@ static int policy_cache_new(X509 *x)
goto bad_cache;
} else if (!policy_cache_set_int(&cache->any_skip, ext_any))
goto bad_cache;
goto just_cleanup;
if (0) {
bad_cache:
x->ex_flags |= EXFLAG_INVALID_POLICY;
}
x->ex_flags |= EXFLAG_INVALID_POLICY;
just_cleanup:
if (ext_pcons)
POLICY_CONSTRAINTS_free(ext_pcons);


+ 8
- 9
demos/bio/sconnect.c View File

@ -96,17 +96,16 @@ char *argv[];
}
ret = 1;
goto done;
if (0) {
err:
if (ERR_peek_error() == 0) { /* system call error */
fprintf(stderr, "errno=%d ", errno);
perror("error");
} else
ERR_print_errors_fp(stderr);
}
if (ERR_peek_error() == 0) { /* system call error */
fprintf(stderr, "errno=%d ", errno);
perror("error");
} else
ERR_print_errors_fp(stderr);
done:
BIO_free_all(out);
SSL_CTX_free(ssl_ctx);
exit(!ret);
return (ret);
return (ret == 1);
}

+ 7
- 7
ssl/s3_clnt.c View File

@ -1189,7 +1189,7 @@ int ssl3_get_server_certificate(SSL *s)
if ((sk = sk_X509_new_null()) == NULL) {
SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, ERR_R_MALLOC_FAILURE);
goto err;
goto done;
}
n2l3(p, llen);
@ -1222,7 +1222,7 @@ int ssl3_get_server_certificate(SSL *s)
}
if (!sk_X509_push(sk, x)) {
SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, ERR_R_MALLOC_FAILURE);
goto err;
goto done;
}
x = NULL;
nc += l + 3;
@ -1250,7 +1250,7 @@ int ssl3_get_server_certificate(SSL *s)
sc = ssl_sess_cert_new();
if (sc == NULL)
goto err;
goto done;
ssl_sess_cert_free(s->session->sess_cert);
s->session->sess_cert = sc;
@ -1332,11 +1332,11 @@ int ssl3_get_server_certificate(SSL *s)
x = NULL;
ret = 1;
if (0) {
goto done;
f_err:
ssl3_send_alert(s, SSL3_AL_FATAL, al);
}
err:
ssl3_send_alert(s, SSL3_AL_FATAL, al);
done:
EVP_PKEY_free(pkey);
X509_free(x);
sk_X509_pop_free(sk, X509_free);


+ 0
- 1
ssl/s3_lib.c View File

@ -3570,7 +3570,6 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
ptmp = EVP_PKEY_new();
if (!ptmp)
return 0;
if (0) ;
#ifndef OPENSSL_NO_RSA
else if (sc->peer_rsa_tmp)
rv = EVP_PKEY_set1_RSA(ptmp, sc->peer_rsa_tmp);


+ 8
- 10
ssl/s3_srvr.c View File

@ -3184,7 +3184,7 @@ int ssl3_get_client_certificate(SSL *s)
if ((sk = sk_X509_new_null()) == NULL) {
SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, ERR_R_MALLOC_FAILURE);
goto err;
goto done;
}
n2l3(p, llen);
@ -3206,7 +3206,7 @@ int ssl3_get_client_certificate(SSL *s)
x = d2i_X509(NULL, &p, l);
if (x == NULL) {
SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, ERR_R_ASN1_LIB);
goto err;
goto done;
}
if (p != (q + l)) {
al = SSL_AD_DECODE_ERROR;
@ -3216,7 +3216,7 @@ int ssl3_get_client_certificate(SSL *s)
}
if (!sk_X509_push(sk, x)) {
SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, ERR_R_MALLOC_FAILURE);
goto err;
goto done;
}
x = NULL;
nc += l + 3;
@ -3279,7 +3279,7 @@ int ssl3_get_client_certificate(SSL *s)
s->session->sess_cert = ssl_sess_cert_new();
if (s->session->sess_cert == NULL) {
SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, ERR_R_MALLOC_FAILURE);
goto err;
goto done;
}
}
sk_X509_pop_free(s->session->sess_cert->cert_chain, X509_free);
@ -3288,15 +3288,13 @@ int ssl3_get_client_certificate(SSL *s)
* Inconsistency alert: cert_chain does *not* include the peer's own
* certificate, while we do include it in s3_clnt.c
*/
sk = NULL;
ret = 1;
if (0) {
goto done;
f_err:
ssl3_send_alert(s, SSL3_AL_FATAL, al);
}
err:
ssl3_send_alert(s, SSL3_AL_FATAL, al);
done:
X509_free(x);
sk_X509_pop_free(sk, X509_free);
return (ret);


+ 0
- 4
ssl/ssl_asn1.c View File

@ -325,10 +325,6 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
if (as == NULL)
goto err;
if (0) {
i2d_SSL_SESSION_ASN1(NULL, NULL);
}
if (!a || !*a) {
ret = SSL_SESSION_new();
if (ret == NULL)


+ 6
- 8
ssl/ssl_cert.c View File

@ -850,12 +850,12 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file)
sk_X509_NAME_push(ret, xn);
}
}
goto done;
if (0) {
err:
sk_X509_NAME_pop_free(ret, X509_NAME_free);
ret = NULL;
}
sk_X509_NAME_pop_free(ret, X509_NAME_free);
ret = NULL;
done:
sk_X509_NAME_free(sk);
BIO_free(in);
X509_free(x);
@ -911,17 +911,15 @@ int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
}
ERR_clear_error();
goto done;
if (0) {
err:
ret = 0;
}
done:
BIO_free(in);
if (x != NULL)
X509_free(x);
(void)sk_X509_NAME_set_cmp_func(stack, oldcmp);
return ret;
}


+ 3
- 5
ssl/ssl_lib.c View File

@ -2838,13 +2838,11 @@ SSL *SSL_dup(SSL *s)
}
}
}
return ret;
if (0) {
err:
SSL_free(ret);
ret = NULL;
}
return (ret);
SSL_free(ret);
return NULL;
}
void ssl_clear_cipher_ctx(SSL *s)


Loading…
Cancel
Save