Commit 11abf922 authored by Matt Caswell's avatar Matt Caswell
Browse files

Dead code removal from apps

Some miscellaneous removal of dead code from apps. Also fix an issue with
error handling with pkcs7.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent b7573c59
Loading
Loading
Loading
Loading
+3 −3
Changes for apps/pkcs7.c: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -189,9 +189,9 @@ int MAIN(int argc, char **argv)
    if (infile == NULL)
        BIO_set_fp(in, stdin, BIO_NOCLOSE);
    else {
        if (BIO_read_filename(in, infile) <= 0)
            if (in == NULL) {
                perror(infile);
        if (BIO_read_filename(in, infile) <= 0) {
            BIO_printf(bio_err, "unable to load input file\n");
            ERR_print_errors(bio_err);
            goto end;
        }
    }
+1 −1
Changes for apps/s_server.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity,
    }
    if (s_debug)
        BIO_printf(bio_s_out, "identity_len=%d identity=%s\n",
                   identity ? (int)strlen(identity) : 0, identity);
                   (int)strlen(identity), identity);

    /* here we could lookup the given identity e.g. from a database */
    if (strcmp(identity, psk_identity) != 0) {