Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto avoid dup openssl
details: https://anonhg.NetBSD.org/src/rev/b518dab2b7cb
branches: trunk
changeset: 374712:b518dab2b7cb
user: christos <christos%NetBSD.org@localhost>
date: Wed May 10 02:23:56 2023 +0000
description:
avoid dup openssl
diffstat:
crypto/external/bsd/openssl/lib/libcrypto/man.inc | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/Makefile | 7 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl-format-options.1 | 269 +++
crypto/external/bsd/openssl/lib/libcrypto/man/openssl-namedisplay-options.1 | 288 ++++
crypto/external/bsd/openssl/lib/libcrypto/man/openssl-passphrase-options.1 | 201 ++
crypto/external/bsd/openssl/lib/libcrypto/man/openssl-verification-options.1 | 714 ++++++++++
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-format-options.1 | 269 ---
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-namedisplay-options.1 | 288 ----
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-passphrase-options.1 | 201 --
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-verification-options.1 | 714 ----------
10 files changed, 1482 insertions(+), 1479 deletions(-)
diffs (truncated from 3030 to 300 lines):
diff -r 4818feac75ef -r b518dab2b7cb crypto/external/bsd/openssl/lib/libcrypto/man.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/man.inc Wed May 10 01:23:27 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/man.inc Wed May 10 02:23:56 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: man.inc,v 1.15 2023/05/07 20:06:17 christos Exp $
+# $NetBSD: man.inc,v 1.16 2023/05/10 02:23:56 christos Exp $
.PATH: ${.CURDIR}/man
@@ -721,8 +721,12 @@ openssl-core.h.7 \
openssl-core_dispatch.h.7 \
openssl-core_names.h.7 \
openssl-env.7 \
+openssl-format-options.1 \
openssl-glossary.7 \
+openssl-namedisplay-options.1 \
+openssl-passphrase-options.1 \
openssl-threads.7 \
+openssl-verification-options.1 \
openssl.1 \
openssl.cnf.5 \
openssl_CA.pl.1 \
@@ -752,10 +756,6 @@ openssl_genrsa.1 \
openssl_list.1 \
openssl_nseq.1 \
openssl_ocsp.1 \
-openssl_openssl-format-options.1 \
-openssl_openssl-namedisplay-options.1 \
-openssl_openssl-passphrase-options.1 \
-openssl_openssl-verification-options.1 \
openssl_passwd.1 \
openssl_pkcs12.1 \
openssl_pkcs7.1 \
diff -r 4818feac75ef -r b518dab2b7cb crypto/external/bsd/openssl/lib/libcrypto/man/Makefile
--- a/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile Wed May 10 01:23:27 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile Wed May 10 02:23:56 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2023/05/07 20:06:19 christos Exp $
+# $NetBSD: Makefile,v 1.8 2023/05/10 02:23:56 christos Exp $
# the makefile is not, and should not be visited during normal build process.
# try to use latest pod2man, which comes with the latest perl.
@@ -20,7 +20,10 @@ make-manpages:
1) if [ "$$fn" = "openssl" ]; then \
dst=$$fn.$$sec; \
else \
- dst=openssl_$$fn.$$sec; \
+ case $$fn \
+ openssl*) dst=$$fn.$$sec;; \
+ *) dst=openssl_$$fn.$$sec;; \
+ eaac; \\
fi;; \
*) dst=$$fn.$$sec;; \
esac; \
diff -r 4818feac75ef -r b518dab2b7cb crypto/external/bsd/openssl/lib/libcrypto/man/openssl-format-options.1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-format-options.1 Wed May 10 02:23:56 2023 +0000
@@ -0,0 +1,269 @@
+.\" $NetBSD: openssl-format-options.1,v 1.1 2023/05/10 02:23:56 christos Exp $
+.\"
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.43)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings. \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote. \*(C+ will
+.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+. ds -- \(*W-
+. ds PI pi
+. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
+. ds L" ""
+. ds R" ""
+. ds C` ""
+. ds C' ""
+'br\}
+.el\{\
+. ds -- \|\(em\|
+. ds PI \(*p
+. ds L" ``
+. ds R" ''
+. ds C`
+. ds C'
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\"
+.\" If the F register is >0, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD. Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
+..
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{\
+. if \nF \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
+..
+. if !\nF==2 \{\
+. nr % 0
+. nr F 2
+. \}
+. \}
+.\}
+.rr rF
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear. Run. Save yourself. No user-serviceable parts.
+. \" fudge factors for nroff and troff
+.if n \{\
+. ds #H 0
+. ds #V .8m
+. ds #F .3m
+. ds #[ \f1
+. ds #] \fP
+.\}
+.if t \{\
+. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+. ds #V .6m
+. ds #F 0
+. ds #[ \&
+. ds #] \&
+.\}
+. \" simple accents for nroff and troff
+.if n \{\
+. ds ' \&
+. ds ` \&
+. ds ^ \&
+. ds , \&
+. ds ~ ~
+. ds /
+.\}
+.if t \{\
+. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+. \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+. \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+. \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+. ds : e
+. ds 8 ss
+. ds o a
+. ds d- d\h'-1'\(ga
+. ds D- D\h'-1'\(hy
+. ds th \o'bp'
+. ds Th \o'LP'
+. ds ae ae
+. ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "OPENSSL-FORMAT-OPTIONS 1"
+.TH OPENSSL-FORMAT-OPTIONS 1 "2023-05-07" "3.0.8" "OpenSSL"
+.\" For nroff, turn off justification. Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+openssl\-format\-options \- OpenSSL command input and output format options
+.SH "LIBRARY"
+libcrypto, -lcrypto
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBopenssl\fR
+\&\fIcommand\fR
+[ \fIoptions\fR ... ]
+[ \fIparameters\fR ... ]
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+Several OpenSSL commands can take input or generate output in a variety
+of formats.
+.PP
+Since OpenSSL 3.0 keys, single certificates, and CRLs can be read from
+files in any of the \fB\s-1DER\s0\fR, \fB\s-1PEM\s0\fR or \fBP12\fR formats. Specifying their input
+format is no more needed and the openssl commands will automatically try all
+the possible formats. However if the \fB\s-1DER\s0\fR or \fB\s-1PEM\s0\fR input format is specified
+it will be enforced.
+.PP
+In order to access a key via an engine the input format \fB\s-1ENGINE\s0\fR may be used;
+alternatively the key identifier in the <uri> argument of the respective key
+option may be preceded by \f(CW\*(C`org.openssl.engine:\*(C'\fR.
+See \*(L"Engine Options\*(R" in \fBopenssl\fR\|(1) for an example usage of the latter.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.SS "Format Options"
+.IX Subsection "Format Options"
+The options to specify the format are as follows.
+Refer to the individual man page to see which options are accepted.
+.IP "\fB\-inform\fR \fIformat\fR, \fB\-outform\fR \fIformat\fR" 4
+.IX Item "-inform format, -outform format"
+The format of the input or output streams.
+.IP "\fB\-keyform\fR \fIformat\fR" 4
+.IX Item "-keyform format"
+Format of a private key input source.
+.IP "\fB\-CRLform\fR \fIformat\fR" 4
+.IX Item "-CRLform format"
+Format of a \s-1CRL\s0 input source.
+.SS "Format Option Arguments"
+.IX Subsection "Format Option Arguments"
+The possible format arguments are described below.
+Both uppercase and lowercase are accepted.
+.PP
+The list of acceptable format arguments, and the default,
+is described in each command documentation.
+.IP "\fB\s-1DER\s0\fR" 4
+.IX Item "DER"
+A binary format, encoded or parsed according to Distinguished Encoding Rules
+(\s-1DER\s0) of the \s-1ASN.1\s0 data language.
+.IP "\fB\s-1ENGINE\s0\fR" 4
+.IX Item "ENGINE"
+Used to specify that the cryptographic material is in an OpenSSL \fBengine\fR.
+An engine must be configured or specified using the \fB\-engine\fR option.
+A password or \s-1PIN\s0 may be supplied to the engine using the \fB\-passin\fR option.
+.IP "\fBP12\fR" 4
+.IX Item "P12"
+A DER-encoded file containing a PKCS#12 object.
+It might be necessary to provide a decryption password to retrieve
+the private key.
+.IP "\fB\s-1PEM\s0\fR" 4
+.IX Item "PEM"
+A text format defined in \s-1IETF RFC 1421\s0 and \s-1IETF RFC 7468.\s0 Briefly, this is
+a block of base\-64 encoding (defined in \s-1IETF RFC 4648\s0), with specific
+lines used to mark the start and end:
+.Sp
+.Vb 7
+\& Text before the BEGIN line is ignored.
+\& \-\-\-\-\- BEGIN object\-type \-\-\-\-\-
+\& OT43gQKBgQC/2OHZoko6iRlNOAQ/tMVFNq7fL81GivoQ9F1U0Qr+DH3ZfaH8eIkX
+\& xT0ToMPJUzWAn8pZv0snA0um6SIgvkCuxO84OkANCVbttzXImIsL7pFzfcwV/ERK
+\& UM6j0ZuSMFOCr/lGPAoOQU0fskidGEHi1/kW+suSr28TqsyYZpwBDQ==
+\& \-\-\-\-\- END object\-type \-\-\-\-\-
+\& Text after the END line is also ignored
+.Ve
+.Sp
+The \fIobject-type\fR must match the type of object that is expected.
+For example a \f(CW\*(C`BEGIN X509 CERTIFICATE\*(C'\fR will not match if the command
+is trying to read a private key. The types supported include:
+.Sp
+.Vb 10
+\& ANY PRIVATE KEY
+\& CERTIFICATE
+\& CERTIFICATE REQUEST
+\& CMS
+\& DH PARAMETERS
+\& DSA PARAMETERS
+\& DSA PUBLIC KEY
+\& EC PARAMETERS
+\& EC PRIVATE KEY
+\& ECDSA PUBLIC KEY
+\& ENCRYPTED PRIVATE KEY
+\& PARAMETERS
+\& PKCS #7 SIGNED DATA
+\& PKCS7
+\& PRIVATE KEY
+\& PUBLIC KEY
+\& RSA PRIVATE KEY
+\& SSL SESSION PARAMETERS
Home |
Main Index |
Thread Index |
Old Index