Commit 7f517c26 authored by Matt Caswell's avatar Matt Caswell
Browse files

Remove some commented out code in libcrypto 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2774)
parent 9fa36f5f

crypto/asn1/d2i_pu.c

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp, 
    default:

        ASN1err(ASN1_F_D2I_PUBLICKEY, ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE);

        goto err;

        /* break; */

    }

    if (a != NULL)

        (*a) = ret;

crypto/bio/bss_acpt.c

+0 −6
Original line number Diff line number Diff line
@@ -521,12 +521,6 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr) 
        ret = (long)data->bind_mode;

        break;

    case BIO_CTRL_DUP:

/*-     dbio=(BIO *)ptr;

        if (data->param_port) EAY EAY

                BIO_set_port(dbio,data->param_port);

        if (data->param_hostname)

                BIO_set_hostname(dbio,data->param_hostname);

        BIO_set_nbio(dbio,data->nbio); */

        break;



    default:

crypto/bio/bss_dgram.c

+0 −1
Original line number Diff line number Diff line
@@ -1911,7 +1911,6 @@ int BIO_dgram_non_fatal_error(int err) 
# endif



        return (1);

        /* break; */

    default:

        break;

    }

crypto/bio/bss_fd.c

+0 −1
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ int BIO_fd_non_fatal_error(int err) 
    case EALREADY:

# endif

        return (1);

        /* break; */

    default:

        break;

    }

crypto/bio/bss_sock.c

+0 −1
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ int BIO_sock_non_fatal_error(int err) 
    case EALREADY:

# endif

        return (1);

        /* break; */

    default:

        break;

    }