summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJuergen Christ <jchrist@linux.ibm.com>2022-01-26 11:48:44 +0100
committerTomas Mraz <tomas@openssl.org>2022-04-12 13:04:57 +0200
commit42f111ad41141e2ecd67f0a6954625a5ad01890b (patch)
treee1fdaecf60de230b2939eb179692f503bd24b215 /doc
parentb2b8d1883a3b7e64006b0b4ada0cbcf3eb6dba1a (diff)
s390: Add new machine generation
Allow to specify "z16" as machine generation in environment variable OPENSSL_s390xcap. It is an alias for "z15". Signed-off-by: Juergen Christ <jchrist@linux.ibm.com> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18054)
Diffstat (limited to 'doc')
-rw-r--r--doc/man3/OPENSSL_s390xcap.pod6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/man3/OPENSSL_s390xcap.pod b/doc/man3/OPENSSL_s390xcap.pod
index f405241153..2cddec5eaf 100644
--- a/doc/man3/OPENSSL_s390xcap.pod
+++ b/doc/man3/OPENSSL_s390xcap.pod
@@ -34,8 +34,8 @@ There are three types of tokens:
The name of a processor generation. A bit in the environment variable's
mask is set to one if and only if the specified processor generation
implements the corresponding instruction set extension. Possible values
-are B<z900>, B<z990>, B<z9>, B<z10>, B<z196>, B<zEC12>, B<z13>, B<z14>
-and B<z15>.
+are B<z900>, B<z990>, B<z9>, B<z10>, B<z196>, B<zEC12>, B<z13>, B<z14>,
+B<z15>, and B<z16>.
=item <string>:<mask>:<mask>
@@ -189,7 +189,7 @@ Disables the KM-XTS-AES and the KIMD-SHAKE function codes:
=head1 COPYRIGHT
-Copyright 2018-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
Licensed under the Apache License 2.0 (the "License"). You may not use
this file except in compliance with the License. You can obtain a copy