===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/openssl.1,v
retrieving revision 1.83
retrieving revision 1.84
diff -c -r1.83 -r1.84
*** src/usr.bin/openssl/openssl.1	2016/10/06 14:47:00	1.83
--- src/usr.bin/openssl/openssl.1	2017/01/03 22:14:41	1.84
***************
*** 1,4 ****
! .\" $OpenBSD: openssl.1,v 1.83 2016/10/06 14:47:00 naddy Exp $
  .\" ====================================================================
  .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  .\"
--- 1,4 ----
! .\" $OpenBSD: openssl.1,v 1.84 2017/01/03 22:14:41 jmc Exp $
  .\" ====================================================================
  .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  .\"
***************
*** 112,118 ****
  .\"
  .\" OPENSSL
  .\"
! .Dd $Mdocdate: October 6 2016 $
  .Dt OPENSSL 1
  .Os
  .Sh NAME
--- 112,118 ----
  .\"
  .\" OPENSSL
  .\"
! .Dd $Mdocdate: January 3 2017 $
  .Dt OPENSSL 1
  .Os
  .Sh NAME
***************
*** 245,251 ****
  is present then the string is obtained from the default section
  using the name
  .Dq asn1 .
! The encoded data is passed through the ASN1 parser and printed out as
  though it came from a file;
  the contents can thus be examined and written to a file using the
  .Fl out
--- 245,251 ----
  is present then the string is obtained from the default section
  using the name
  .Dq asn1 .
! The encoded data is passed through the ASN.1 parser and printed out as
  though it came from a file;
  the contents can thus be examined and written to a file using the
  .Fl out
***************
*** 361,367 ****
  .It Fl enddate Ar date
  Set the expiry date.
  The format of the date is YYMMDDHHMMSSZ
! .Pq the same as an ASN1 UTCTime structure .
  .It Fl extensions Ar section
  The section of the configuration file containing certificate extensions
  to be added when a certificate is issued (defaults to
--- 361,367 ----
  .It Fl enddate Ar date
  Set the expiry date.
  The format of the date is YYMMDDHHMMSSZ
! .Pq the same as an ASN.1 UTCTime structure .
  .It Fl extensions Ar section
  The section of the configuration file containing certificate extensions
  to be added when a certificate is issued (defaults to
***************
*** 493,499 ****
  .It Fl startdate Ar date
  Set the start date.
  The format of the date is YYMMDDHHMMSSZ
! .Pq the same as an ASN1 UTCTime structure .
  .It Fl status Ar serial
  Show the status of the certificate with serial number
  .Ar serial .
--- 493,499 ----
  .It Fl startdate Ar date
  Set the start date.
  The format of the date is YYMMDDHHMMSSZ
! .Pq the same as an ASN.1 UTCTime structure .
  .It Fl status Ar serial
  Show the status of the certificate with serial number
  .Ar serial .
***************
*** 2436,2444 ****
  .It Fl embed
  Generate DSA keys in a broken format.
  The DSA parameters are embedded inside the PrivateKey structure.
! In this form the OCTET STRING contains an ASN1 SEQUENCE consisting of
  two structures:
! a SEQUENCE containing the parameters and an ASN1 INTEGER containing
  the private key.
  .It Fl in Ar file
  The input file to read from,
--- 2436,2444 ----
  .It Fl embed
  Generate DSA keys in a broken format.
  The DSA parameters are embedded inside the PrivateKey structure.
! In this form the OCTET STRING contains an ASN.1 SEQUENCE consisting of
  two structures:
! a SEQUENCE containing the parameters and an ASN.1 INTEGER containing
  the private key.
  .It Fl in Ar file
  The input file to read from,
***************
*** 2815,2824 ****
  The options are as follows:
  .Bl -tag -width Ds
  .It Fl asn1parse
! ASN1parse the output data.
  This is useful when combined with the
  .Fl verifyrecover
! option when an ASN1 structure is signed.
  .It Fl certin
  The input is a certificate containing a public key.
  .It Fl decrypt
--- 2815,2824 ----
  The options are as follows:
  .Bl -tag -width Ds
  .It Fl asn1parse
! ASN.1 parse the output data.
  This is useful when combined with the
  .Fl verifyrecover
! option when an ASN.1 structure is signed.
  .It Fl certin
  The input is a certificate containing a public key.
  .It Fl decrypt
***************
*** 4161,4167 ****
  .It Fl inform Cm der | pem
  The input format.
  .Cm der
! uses an ASN1 DER-encoded format containing session details.
  The precise format can vary from one version to the next.
  .Cm pem
  is the default format: it consists of the DER
--- 4161,4167 ----
  .It Fl inform Cm der | pem
  The input format.
  .Cm der
! uses an ASN.1 DER-encoded format containing session details.
  The precise format can vary from one version to the next.
  .Cm pem
  is the default format: it consists of the DER
***************
*** 5428,5434 ****
  .It Cm ext_error
  Print an error message for unsupported certificate extensions.
  .It Cm ext_parse
! ASN1 parse unsupported extensions.
  .It Cm no_aux
  Do not print certificate trust information.
  .It Cm no_extensions
--- 5428,5434 ----
  .It Cm ext_error
  Print an error message for unsupported certificate extensions.
  .It Cm ext_parse
! ASN.1 parse unsupported extensions.
  .It Cm no_aux
  Do not print certificate trust information.
  .It Cm no_extensions
***************
*** 5593,5599 ****
  for the AVA separator,
  as well as indenting the fields by four characters.
  .It Cm show_type
! Show the type of the ASN1 character string.
  The type precedes the field contents.
  For example
  .Qq BMPSTRING: Hello World .
--- 5593,5599 ----
  for the AVA separator,
  as well as indenting the fields by four characters.
  .It Cm show_type
! Show the type of the ASN.1 character string.
  The type precedes the field contents.
  For example
  .Qq BMPSTRING: Hello World .