diff options
| author |   jsg <jsg@openbsd.org> | 2014-04-15 11:50:18 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2014-04-15 11:50:18 +0000 |
| commit | a5ded1055c4a999120374cd3283b2e17b89cc517 (patch) | |
| tree | 2f05ceab25ce2d3e41c364531b64b344c7dd450c /lib/libssl/src | |
| parent | catch directories we don't have the right to enter instead of letting Find (diff) | |
| download | wireguard-openbsd-a5ded1055c4a999120374cd3283b2e17b89cc517.tar.xz wireguard-openbsd-a5ded1055c4a999120374cd3283b2e17b89cc517.zip | |
correct cases of code occuring directly after goto/break/return
ok miod@ guenther@
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/crypto/x509/x509_vfy.c | 1 | ||||
| -rw-r--r-- | lib/libssl/src/ssl/d1_both.c | 2 | ||||
| -rw-r--r-- | lib/libssl/src/ssl/ssl_task.c | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/lib/libssl/src/crypto/x509/x509_vfy.c b/lib/libssl/src/crypto/x509/x509_vfy.c index 920066aeba3..a82c2872e0d 100644 --- a/lib/libssl/src/crypto/x509/x509_vfy.c +++ b/lib/libssl/src/crypto/x509/x509_vfy.c @@ -424,7 +424,6 @@ static int check_issued(X509_STORE_CTX *ctx, X509 *x, X509 *issuer) ctx->current_cert = x; ctx->current_issuer = issuer; return ctx->verify_cb(0, ctx); - return 0; } /* Alternative lookup method: look from a STACK stored in other_ctx */ diff --git a/lib/libssl/src/ssl/d1_both.c b/lib/libssl/src/ssl/d1_both.c index 6e51aa7f699..ab6b1684107 100644 --- a/lib/libssl/src/ssl/d1_both.c +++ b/lib/libssl/src/ssl/d1_both.c @@ -647,8 +647,8 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok) { item = pitem_new(seq64be, frag); if (item == NULL) { - goto err; i = -1; + goto err; } pqueue_insert(s->d1->buffered_messages, item); diff --git a/lib/libssl/src/ssl/ssl_task.c b/lib/libssl/src/ssl/ssl_task.c index 25d20b06a0b..be0319831ab 100644 --- a/lib/libssl/src/ssl/ssl_task.c +++ b/lib/libssl/src/ssl/ssl_task.c @@ -322,14 +322,14 @@ doit(io_channel chan, SSL_CTX *s_ctx ) } if (length < RPC_HDR_SIZE ) { printf("Error in main loop get size: %d\n", length ); - break; link_state = 3; + break; } if (msg.channel != 'A' ) { printf("Error in main loop, unexpected channel: %c\n", msg.channel ); - break; link_state = 3; + break; } if (msg.function == 'G' ) { link_state = 1; |