Go to file
Bastian Germann d4c3bdb0f1 apps x509: restrict CAkeyform option to OPT_FMT_PDE
CAkeyform may be set to PEM, DER or ENGINE, but the current options
are not using the proper optionformat 'E' (OPT_FMT_PDE) for this.

Set the valtype for CAkeyform to 'E' and use OPT_FMT_PDE when extracting
the option value.

This amends 0ab6fc79a9 ("Fix regression on x509 keyform argument") which
did the same thing for keyform and changed the manpage synopsis entries
for both keyform and CAkeyform but did not change the option section.
Hence, change the option section for both of them.

CLA: trivial

Co-developed-by: Torben Hohn <torben.hohn@linutronix.de>
Signed-off-by: Torben Hohn <torben.hohn@linutronix.de>
Signed-off-by: Bastian Germann <bage@linutronix.de>

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11085)
2020-02-26 17:23:53 +01:00
.github Add a GitHub issue template for documentation issues 2019-10-30 17:46:00 +01:00
apps apps x509: restrict CAkeyform option to OPT_FMT_PDE 2020-02-26 17:23:53 +01:00
boringssl@2070f8ad91
Configurations TEST: Create test specific output directories 2020-02-18 09:45:51 +01:00
crypto secmem: ignore small minsize arguments to CRYPTO_secure_malloc_init(). 2020-02-26 15:38:37 +10:00
demos Remove RANDFILE settings from configuration files 2019-11-24 08:35:14 +01:00
doc apps x509: restrict CAkeyform option to OPT_FMT_PDE 2020-02-26 17:23:53 +01:00
engines Deprecate the low level RSA functions. 2020-02-20 18:58:40 +10:00
external/perl
fuzz Deprecate the low level Diffie-Hellman functions. 2020-02-20 19:04:57 +10:00
include Mem-sec small code adjustment 2020-02-26 15:31:17 +10:00
krb5@890ca2f401 Update the krb5 submodule 2019-12-25 12:45:32 -08:00
ms
os-dep
providers Check that the DRBG's internal state has been zeroized after uninstantiation 2020-02-25 11:30:00 +01:00
pyca-cryptography@09403100de
ssl Deprecate the low level Diffie-Hellman functions. 2020-02-20 19:04:57 +10:00
test Refactor evp_pkey_make_provided() to do legacy to provider export 2020-02-22 01:19:54 +01:00
tools
util PROV: add RSA signature implementation 2020-02-22 01:07:15 +01:00
VMS
.gitattributes
.gitignore Add *.d.tmp files to .gitignore 2020-02-20 16:58:19 +00:00
.gitmodules
.travis-apt-pin.preferences
.travis-create-release.sh
.travis.yml Avoid arm64 builds timeout due to silent make taking too long time 2020-02-26 16:47:22 +01:00
ACKNOWLEDGEMENTS
appveyor.yml Add a minimal build target for Travis and Appveyor 2020-02-11 13:22:39 +01:00
AUTHORS
build.info Add better support for using deprecated symbols internally 2019-12-13 10:09:49 +01:00
CHANGES DH: add CHANGES entry listing the deprecated DH functions. 2020-02-20 19:01:59 +10:00
config config: Drop linux-alpha-gcc+bwx 2020-02-25 11:21:59 +01:00
config.com
configdata.pm.in configdata.pm.in: Don't try to quotify undefined values 2019-12-04 00:19:40 +01:00
Configure Make secure-memory be a config option 2020-02-14 15:18:27 +01:00
CONTRIBUTING Fix misspelling errors and typos reported by codespell 2020-02-06 17:01:00 +01:00
e_os.h Make secure-memory be a config option 2020-02-14 15:18:27 +01:00
FAQ
HACKING
INSTALL Deprecate most of debug-memory 2019-12-14 20:57:35 +01:00
LICENSE
NEWS NEWS: DH, DSA, ECDH, ECDSA and RSA public key function deprecation note 2020-02-20 18:58:40 +10:00
NOTES.ANDROID Remove spurious space from file. 2019-12-05 07:25:52 +10:00
NOTES.DJGPP
NOTES.PERL
NOTES.UNIX
NOTES.VALGRIND
NOTES.VMS
NOTES.WIN
README
README.ENGINE
README.FIPS
VERSION

 Copyright (c) 1998-2018 The OpenSSL Project
 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
 All rights reserved.

 DESCRIPTION
 -----------

 The OpenSSL Project is a collaborative effort to develop a robust,
 commercial-grade, fully featured, and Open Source toolkit implementing the
 Transport Layer Security (TLS) protocols (including SSLv3) as well as a
 full-strength general purpose cryptographic library.

 OpenSSL is descended from the SSLeay library developed by Eric A. Young
 and Tim J. Hudson.

 The OpenSSL toolkit is licensed under the Apache License 2.0, which means
 that you are free to get and use it for commercial and non-commercial
 purposes as long as you fulfill its conditions.

 OVERVIEW
 --------

 The OpenSSL toolkit includes:

 libssl (with platform specific naming):
     Provides the client and server-side implementations for SSLv3 and TLS.

 libcrypto (with platform specific naming):
     Provides general cryptographic and X.509 support needed by SSL/TLS but
     not logically part of it.

 openssl:
     A command line tool that can be used for:
        Creation of key parameters
        Creation of X.509 certificates, CSRs and CRLs
        Calculation of message digests
        Encryption and decryption
        SSL/TLS client and server tests
        Handling of S/MIME signed or encrypted mail
        And more...

 INSTALLATION
 ------------

 See the appropriate file:
        INSTALL         Linux, Unix, Windows, OpenVMS, ...
        NOTES.*         INSTALL addendums for different platforms

 SUPPORT
 -------

 See the OpenSSL website www.openssl.org for details on how to obtain
 commercial technical support. Free community support is available through the
 openssl-users email list (see
 https://www.openssl.org/community/mailinglists.html for further details).

 If you have any problems with OpenSSL then please take the following steps
 first:

    - Download the latest version from the repository
      to see if the problem has already been addressed
    - Configure with no-asm
    - Remove compiler optimization flags

 If you wish to report a bug then please include the following information
 and create an issue on GitHub:

    - OpenSSL version: output of 'openssl version -a'
    - Configuration data: output of 'perl configdata.pm --dump'
    - OS Name, Version, Hardware platform
    - Compiler Details (name, version)
    - Application Details (name, version)
    - Problem Description (steps that will reproduce the problem, if known)
    - Stack Traceback (if the application dumps core)

 Just because something doesn't work the way you expect does not mean it
 is necessarily a bug in OpenSSL. Use the openssl-users email list for this type
 of query.

 HOW TO CONTRIBUTE TO OpenSSL
 ----------------------------

 See CONTRIBUTING

 LEGALITIES
 ----------

 A number of nations restrict the use or export of cryptography. If you
 are potentially subject to such restrictions you should seek competent
 professional legal advice before attempting to develop or distribute
 cryptographic code.