Commit 812e0c8d authored by Richard Levitte's avatar Richard Levitte
Browse files

make update 



Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>
parent 9a9f8ee7

apps/progs.h

+22 −7
Original line number Diff line number Diff line 
/*

 * Automatically generated by progs.pl for openssl.c

 * Copyright (c) 2008 The OpenSSL Project.  All rights reserved.

 * See the openssl.c for copyright details.

 * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL licenses, (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 * https://www.openssl.org/source/license.html

 * or in the file LICENSE in the source distribution.

 */



typedef enum FUNC_TYPE {
@@ -120,7 +125,7 @@ extern OPTIONS x509_options[]; 
static FUNCTION functions[] = {

    { FT_general, "asn1parse", asn1parse_main, asn1parse_options },

    { FT_general, "ca", ca_main, ca_options },

#if !defined(OPENSSL_NO_SOCK)

#ifndef OPENSSL_NO_SOCK

    { FT_general, "ciphers", ciphers_main, ciphers_options },

#endif

#ifndef OPENSSL_NO_CMS
@@ -164,7 +169,7 @@ static FUNCTION functions[] = { 
    { FT_general, "ocsp", ocsp_main, ocsp_options },

#endif

    { FT_general, "passwd", passwd_main, passwd_options },

#if !defined(OPENSSL_NO_DES)

#ifndef OPENSSL_NO_DES

    { FT_general, "pkcs12", pkcs12_main, pkcs12_options },

#endif

    { FT_general, "pkcs7", pkcs7_main, pkcs7_options },
@@ -182,13 +187,13 @@ static FUNCTION functions[] = { 
#ifndef OPENSSL_NO_RSA

    { FT_general, "rsautl", rsautl_main, rsautl_options },

#endif

#if !defined(OPENSSL_NO_SOCK)

#ifndef OPENSSL_NO_SOCK

    { FT_general, "s_client", s_client_main, s_client_options },

#endif

#if !defined(OPENSSL_NO_SOCK)

#ifndef OPENSSL_NO_SOCK

    { FT_general, "s_server", s_server_main, s_server_options },

#endif

#if !defined(OPENSSL_NO_SOCK)

#ifndef OPENSSL_NO_SOCK

    { FT_general, "s_time", s_time_main, s_time_options },

#endif

    { FT_general, "sess_id", sess_id_main, sess_id_options },
@@ -216,11 +221,21 @@ static FUNCTION functions[] = { 
#ifndef OPENSSL_NO_MD_GHOST94

    { FT_md, "md_ghost94", dgst_main},

#endif

#ifndef OPENSSL_NO_SHA

    { FT_md, "sha1", dgst_main},

#endif

#ifndef OPENSSL_NO_SHA

    { FT_md, "sha224", dgst_main},

#endif

#ifndef OPENSSL_NO_SHA

    { FT_md, "sha256", dgst_main},

#endif

#ifndef OPENSSL_NO_SHA

    { FT_md, "sha384", dgst_main},

#endif

#ifndef OPENSSL_NO_SHA

    { FT_md, "sha512", dgst_main},

#endif

#ifndef OPENSSL_NO_MDC2

    { FT_md, "mdc2", dgst_main},

#endif