summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2014-04-15 11:50:19 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2014-04-15 11:50:19 +0000
commit8d32adfc35a48c0e0d53367f182f5db6e4af484d (patch)
tree492da0885ce10aaf8b05ee57a1b8de9064992f1d
parentfdbb56eaa3c68c6ee128520abbe7e812fadbdc2c (diff)
correct cases of code occuring directly after goto/break/return
ok miod@ guenther@
-rw-r--r--lib/libcrypto/x509/x509_vfy.c1
-rw-r--r--lib/libssl/d1_both.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/libcrypto/x509/x509_vfy.c b/lib/libcrypto/x509/x509_vfy.c
index 920066aeba3..a82c2872e0d 100644
--- a/lib/libcrypto/x509/x509_vfy.c
+++ b/lib/libcrypto/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/d1_both.c b/lib/libssl/d1_both.c
index 6e51aa7f699..ab6b1684107 100644
--- a/lib/libssl/d1_both.c
+++ b/lib/libssl/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);