Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel D. Daugherty committed Jul 20, 2022
2 parents b1817a3 + 17e65bb commit 9c19d89
Show file tree
Hide file tree
Showing 28 changed files with 488 additions and 76 deletions.
39 changes: 20 additions & 19 deletions src/java.base/share/man/keytool.1
Expand Up @@ -22,7 +22,7 @@
.\"t
.\" Automatically generated by Pandoc 2.3.1
.\"
.TH "KEYTOOL" "1" "2022" "JDK 19\-ea" "JDK Commands"
.TH "KEYTOOL" "1" "2022" "JDK 19" "JDK Commands"
.hy
.SH NAME
.PP
Expand Down Expand Up @@ -433,7 +433,7 @@ single\-element certificate chain.
When the \f[CB]\-signer\f[R] option is specified, a new certificate is
generated and signed by the designated signer and stored as a
multiple\-element certificate chain (containing the generated
certificate itself, and the signer???s certificate chain).
certificate itself, and the signer?s certificate chain).
The certificate chain and private key are stored in a new keystore entry
that is identified by its alias.
.PP
Expand All @@ -453,15 +453,15 @@ specified.
The \f[CB]\-signer\f[R] value specifies the alias of a
\f[CB]PrivateKeyEntry\f[R] for the signer that already exists in the
keystore.
This option is used to sign the certificate with the signer???s private
This option is used to sign the certificate with the signer?s private
key.
This is especially useful for key agreement algorithms (i.e.
the \f[CB]\-keyalg\f[R] value is \f[CB]XDH\f[R], \f[CB]X25519\f[R],
\f[CB]X448\f[R], or \f[CB]DH\f[R]) as these keys cannot be used for digital
signatures, and therefore a self\-signed certificate cannot be created.
.PP
The \f[CB]\-signerkeypass\f[R] value specifies the password of the
signer???s private key.
signer?s private key.
It can be specified if the private key of the signer entry is protected
by a password different from the store password.
.PP
Expand Down Expand Up @@ -1571,8 +1571,9 @@ The following examples show the defaults for various option values:
\-alias\ "mykey"

\-keysize
\ \ \ \ 2048\ (when\ using\ \-genkeypair\ and\ \-keyalg\ is\ "RSA",\ "DSA",\ "RSASSA\-PSS",\ or\ "DH")
\ \ \ \ 256\ (when\ using\ \-genkeypair\ and\ \-keyalg\ is\ "EC")
\ \ \ \ 2048\ (when\ using\ \-genkeypair\ and\ \-keyalg\ is\ "DSA")
\ \ \ \ 3072\ (when\ using\ \-genkeypair\ and\ \-keyalg\ is\ "RSA",\ "RSASSA\-PSS",\ or\ "DH")
\ \ \ \ 384\ (when\ using\ \-genkeypair\ and\ \-keyalg\ is\ "EC")
\ \ \ \ 255\ (when\ using\ \-genkeypair\ and\ \-keyalg\ is\ "EdDSA",\ or\ "XDH)
\ \ \ \ 56\ (when\ using\ \-genseckey\ and\ \-keyalg\ is\ "DES")
\ \ \ \ 168\ (when\ using\ \-genseckey\ and\ \-keyalg\ is\ "DESede")
Expand Down Expand Up @@ -1600,6 +1601,7 @@ signature algorithm (\f[CB]\-sigalg\f[R] option) is derived from the
algorithm of the underlying private key to provide an appropriate level
of security strength as follows:
.PP
Default Signature Algorithms
.TS
tab(@);
l l l.
Expand All @@ -1621,9 +1623,9 @@ T}
T{
RSA
T}@T{
<= 3072
< 624
T}@T{
SHA256withRSA
SHA256withRSA (keysize is too small for using SHA\-384)
T}
T{
T}@T{
Expand All @@ -1640,28 +1642,27 @@ T}
T{
EC
T}@T{
< 384
T}@T{
SHA256withECDSA
T}
T{
T}@T{
< 512
T}@T{
SHA384withECDSA
T}
T{
T}@T{
= 512
>= 512
T}@T{
SHA512withECDSA
T}
T{
RSASSA\-PSS
T}@T{
<= 3072
< 624
T}@T{
RSASSA\-PSS (with SHA\-256, keysize is too small for
T}
T{
T}@T{
T}@T{
RSASSA\-PSS (with SHA\-256)
using SHA\-384)
T}
T{
T}@T{
Expand Down Expand Up @@ -1946,9 +1947,9 @@ distinguished name is \f[CB]myname\f[R], \f[CB]mygroup\f[R],
\f[CB]mycompany\f[R], and a two\-letter country code of
\f[CB]mycountry\f[R].
It uses the RSA key generation algorithm to create the keys; both are
2048 bits
3072 bits.
.PP
The command uses the default SHA256withRSA signature algorithm to create
The command uses the default SHA384withRSA signature algorithm to create
a self\-signed certificate that includes the public key and the
distinguished name information.
The certificate is valid for 180 days, and is associated with the
Expand Down
2 changes: 1 addition & 1 deletion src/java.rmi/share/man/rmiregistry.1
Expand Up @@ -21,7 +21,7 @@
.\"
.\" Automatically generated by Pandoc 2.3.1
.\"
.TH "RMIREGISTRY" "1" "2022" "JDK 19\-ea" "JDK Commands"
.TH "RMIREGISTRY" "1" "2022" "JDK 19" "JDK Commands"
.hy
.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion src/java.scripting/share/man/jrunscript.1
Expand Up @@ -21,7 +21,7 @@
.\"
.\" Automatically generated by Pandoc 2.3.1
.\"
.TH "JRUNSCRIPT" "1" "2022" "JDK 19\-ea" "JDK Commands"
.TH "JRUNSCRIPT" "1" "2022" "JDK 19" "JDK Commands"
.hy
.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion src/jdk.compiler/share/man/javac.1
Expand Up @@ -21,7 +21,7 @@
.\"
.\" Automatically generated by Pandoc 2.3.1
.\"
.TH "JAVAC" "1" "2022" "JDK 19\-ea" "JDK Commands"
.TH "JAVAC" "1" "2022" "JDK 19" "JDK Commands"
.hy
.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion src/jdk.compiler/share/man/serialver.1
Expand Up @@ -21,7 +21,7 @@
.\"
.\" Automatically generated by Pandoc 2.3.1
.\"
.TH "SERIALVER" "1" "2022" "JDK 19\-ea" "JDK Commands"
.TH "SERIALVER" "1" "2022" "JDK 19" "JDK Commands"
.hy
.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion src/jdk.hotspot.agent/share/man/jhsdb.1
Expand Up @@ -21,7 +21,7 @@
.\"
.\" Automatically generated by Pandoc 2.3.1
.\"
.TH "JHSDB" "1" "2022" "JDK 19\-ea" "JDK Commands"
.TH "JHSDB" "1" "2022" "JDK 19" "JDK Commands"
.hy
.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion src/jdk.httpserver/share/man/jwebserver.1
Expand Up @@ -21,7 +21,7 @@
.\"
.\" Automatically generated by Pandoc 2.3.1
.\"
.TH "JWEBSERVER" "1" "2022" "JDK 19\-ea" "JDK Commands"
.TH "JWEBSERVER" "1" "2022" "JDK 19" "JDK Commands"
.hy
.SH NAME
.PP
Expand Down
21 changes: 19 additions & 2 deletions src/jdk.jartool/share/man/jar.1
@@ -1,4 +1,4 @@
.\" Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
.\" Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
.\"
.\" This code is free software; you can redistribute it and/or modify it
Expand All @@ -21,7 +21,7 @@
.\"
.\" Automatically generated by Pandoc 2.3.1
.\"
.TH "JAR" "1" "2022" "JDK 19\-ea" "JDK Commands"
.TH "JAR" "1" "2022" "JDK 19" "JDK Commands"
.hy
.SH NAME
.PP
Expand Down Expand Up @@ -211,6 +211,13 @@ You can use the following options to customize the actions of the create
Stores without using ZIP compression.
.RS
.RE
.TP
.B \f[CB]\-\-date=\f[R]\f[I]TIMESTAMP\f[R]
The timestamp in ISO\-8601 extended offset date\-time with optional
time\-zone format, to use for the timestamp of the entries, e.g.
"2022\-02\-12T12:30:00\-05:00".
.RS
.RE
.SH OTHER OPTIONS
.PP
The following options are recognized by the \f[CB]jar\f[R] command and not
Expand Down Expand Up @@ -242,6 +249,16 @@ Create an archive, \f[CB]classes.jar\f[R], that contains two class files,
.RE
.RE
.IP \[bu] 2
Create an archive, \f[CB]classes.jar\f[R], that contains two class files,
\f[CB]Foo.class\f[R] and \f[CB]Bar.class\f[R] setting the last modified date
and time to \f[CB]2021\ Jan\ 6\ 12:36:00\f[R].
.RS 2
.RS
.PP
\f[CB]jar\ \-\-create\ \-\-date="2021\-01\-06T14:36:00+02:00"\ \-\-file=classes.jar\ Foo.class\ Bar.class\f[R]
.RE
.RE
.IP \[bu] 2
Create an archive, \f[CB]classes.jar\f[R], by using an existing manifest,
\f[CB]mymanifest\f[R], that contains all of the files in the directory
\f[CB]foo/\f[R].
Expand Down
34 changes: 18 additions & 16 deletions src/jdk.jartool/share/man/jarsigner.1
Expand Up @@ -22,7 +22,7 @@
.\"t
.\" Automatically generated by Pandoc 2.3.1
.\"
.TH "JARSIGNER" "1" "2022" "JDK 19\-ea" "JDK Commands"
.TH "JARSIGNER" "1" "2022" "JDK 19" "JDK Commands"
.hy
.SH NAME
.PP
Expand Down Expand Up @@ -301,6 +301,7 @@ By default, the \f[CB]jarsigner\f[R] command signs a JAR file using one of
the following algorithms and block file extensions depending on the type
and size of the private key:
.PP
Default Signature Algorithms and Block File Extensions
.TS
tab(@);
l l l l.
Expand All @@ -326,7 +327,7 @@ T}
T{
RSA
T}@T{
<= 3072
< 624
T}@T{
SHA256withRSA
T}@T{
Expand All @@ -349,30 +350,23 @@ T}
T{
EC
T}@T{
< 384
T}@T{
SHA256withECDSA
T}@T{
\&.EC
T}
T{
T}@T{
< 512
T}@T{
SHA384withECDSA
T}@T{
\&.EC
T}
T{
T}@T{
= 512
>= 512
T}@T{
SHA512withECDSA
T}@T{
T}
T{
RSASSA\-PSS
T}@T{
<= 3072
< 624
T}@T{
RSASSA\-PSS (with SHA\-256)
T}@T{
Expand Down Expand Up @@ -415,7 +409,7 @@ use the same parameters in the signature.
Otherwise, jarsigner will use parameters that are determined by the size
of the key as specified in the table above.
For example, an 3072\-bit RSASSA\-PSS key will use RSASSA\-PSS as the
signature algorithm and SHA\-256 as the hash and MGF1 algorithms.
signature algorithm and SHA\-384 as the hash and MGF1 algorithms.
.PP
These default signature algorithms can be overridden by using the
\f[CB]\-sigalg\f[R] option.
Expand Down Expand Up @@ -766,7 +760,7 @@ The file can be a sequence of concatenated X.509 certificates, or a
single PKCS#7 formatted data block, either in binary encoding format or
in printable encoding format (also known as Base64 encoding) as defined
by \f[B]Internet RFC 1421 Certificate Encoding Standard\f[R]
[https://tools.ietf.org/html/rfc1421].
[http://tools.ietf.org/html/rfc1421].
.RS
.RE
.TP
Expand Down Expand Up @@ -809,7 +803,7 @@ the entries of a JAR file.
For a list of standard message digest algorithm names, see Java Security
Standard Algorithm Names.
.PP
If this option isn\[aq]t specified, then \f[CB]SHA256\f[R] is used.
If this option isn\[aq]t specified, then \f[CB]SHA\-384\f[R] is used.
There must either be a statically installed provider supplying an
implementation of the specified algorithm or the user must specify one
with the \f[CB]\-addprovider\f[R] or \f[CB]\-providerClass\f[R] options;
Expand Down Expand Up @@ -946,7 +940,7 @@ digits like \f[CB]1.2.3.4\f[R], for example.
.B \f[CB]\-tsadigestalg\f[R] \f[I]algorithm\f[R]
Specifies the message digest algorithm that is used to generate the
message imprint to be sent to the TSA server.
If this option isn\[aq]t specified, SHA\-256 will be used.
If this option isn\[aq]t specified, SHA\-384 will be used.
.RS
.PP
See \f[B]Supported Algorithms\f[R].
Expand Down Expand Up @@ -1058,6 +1052,14 @@ The preferred way to load PKCS11 is by using modules.
See \f[CB]\-addprovider\f[R].
.RE
.TP
.B \f[CB]\-providerPath\f[R] \f[I]classpath\f[R]
Used to specify the classpath for providers specified by the
\f[CB]\-providerClass\f[R] option.
Multiple paths should be separated by the system\-dependent
path\-separator character.
.RS
.RE
.TP
.B \f[CB]\-J\f[R]\f[I]javaoption\f[R]
Passes through the specified \f[I]javaoption\f[R] string directly to the
Java interpreter.
Expand Down
25 changes: 24 additions & 1 deletion src/jdk.javadoc/share/man/javadoc.1
Expand Up @@ -21,7 +21,7 @@
.\"
.\" Automatically generated by Pandoc 2.3.1
.\"
.TH "JAVADOC" "1" "2022" "JDK 19\-ea" "JDK Commands"
.TH "JAVADOC" "1" "2022" "JDK 19" "JDK Commands"
.hy
.SH NAME
.PP
Expand Down Expand Up @@ -1055,6 +1055,7 @@ The hierarchy is produced by default.
.TP
.B \f[CB]\-\-override\-methods\f[R] (\f[CB]detail\f[R]|\f[CB]summary\f[R])
Documents overridden methods in the detail or summary sections.
The default is \f[CB]detail\f[R].
.RS
.RE
.TP
Expand Down Expand Up @@ -1270,6 +1271,28 @@ are subject to change without notice.
Additional options are less commonly used or are otherwise regarded as
advanced.
.TP
.B \f[CB]\-\-date\f[R] \f[I]date\-and\-time\f[R]
Specifies the value to be used to timestamp the generated pages, in
\f[B]ISO 8601\f[R]
[https://www.iso.org/iso\-8601\-date\-and\-time\-format.html] format.
The specified value must be within 10 years of the current date and
time.
It is an error to specify both \f[CB]\-notimestamp\f[R] and
\f[CB]\-\-date\f[R].
Using a specific value means the generated documentation can be part of
a \f[B]reproducible build\f[R] [https://reproducible\-builds.org/].
If the option is not given, the default value is the current date and
time.
For example:
.RS
.IP
.nf
\f[CB]
javadoc\ \-\-date\ 2022\-02\-01T17:41:59\-08:00\ mypackage
\f[R]
.fi
.RE
.TP
.B \f[CB]\-\-legal\-notices\f[R] (\f[CB]default\f[R]|\f[CB]none\f[R]|\f[I]directory\f[R])
Specifies the location from which to copy legal files to the generated
documentation.
Expand Down
2 changes: 1 addition & 1 deletion src/jdk.jcmd/share/man/jcmd.1
Expand Up @@ -21,7 +21,7 @@
.\"
.\" Automatically generated by Pandoc 2.3.1
.\"
.TH "JCMD" "1" "2022" "JDK 19\-ea" "JDK Commands"
.TH "JCMD" "1" "2022" "JDK 19" "JDK Commands"
.hy
.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion src/jdk.jcmd/share/man/jinfo.1
Expand Up @@ -21,7 +21,7 @@
.\"
.\" Automatically generated by Pandoc 2.3.1
.\"
.TH "JINFO" "1" "2022" "JDK 19\-ea" "JDK Commands"
.TH "JINFO" "1" "2022" "JDK 19" "JDK Commands"
.hy
.SH NAME
.PP
Expand Down

0 comments on commit 9c19d89

Please sign in to comment.