diff options
author | mmcc <> | 2015-12-24 16:54:37 +0000 |
---|---|---|
committer | mmcc <> | 2015-12-24 16:54:37 +0000 |
commit | 0699e42dd81e08d3f7a34a1f06ea7abc4edde29a (patch) | |
tree | 053c4537ed2869dd06b2f7cf064992f974ff9055 | |
parent | f622511e72fa38c7966f438ea21b03653fb37df8 (diff) | |
download | openbsd-0699e42dd81e08d3f7a34a1f06ea7abc4edde29a.tar.gz openbsd-0699e42dd81e08d3f7a34a1f06ea7abc4edde29a.tar.bz2 openbsd-0699e42dd81e08d3f7a34a1f06ea7abc4edde29a.zip |
more e-mail -> email
-rw-r--r-- | src/usr.bin/openssl/ca.c | 4 | ||||
-rw-r--r-- | src/usr.bin/openssl/openssl.1 | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/usr.bin/openssl/ca.c b/src/usr.bin/openssl/ca.c index 8727d9c338..ba7b9413c2 100644 --- a/src/usr.bin/openssl/ca.c +++ b/src/usr.bin/openssl/ca.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ca.c,v 1.19 2015/10/17 15:00:11 doug Exp $ */ | 1 | /* $OpenBSD: ca.c,v 1.20 2015/12/24 16:54:37 mmcc Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1681,7 +1681,7 @@ again2: | |||
1681 | if (verbose) | 1681 | if (verbose) |
1682 | BIO_printf(bio_err, "The subject name appears to be ok, checking data base for clashes\n"); | 1682 | BIO_printf(bio_err, "The subject name appears to be ok, checking data base for clashes\n"); |
1683 | 1683 | ||
1684 | /* Build the correct Subject if no e-mail is wanted in the subject */ | 1684 | /* Build the correct Subject if no email is wanted in the subject */ |
1685 | /* | 1685 | /* |
1686 | * and add it later on because of the method extensions are added | 1686 | * and add it later on because of the method extensions are added |
1687 | * (altName) | 1687 | * (altName) |
diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1 index dc593f42e7..c6cca39cd7 100644 --- a/src/usr.bin/openssl/openssl.1 +++ b/src/usr.bin/openssl/openssl.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: openssl.1,v 1.29 2015/09/21 13:13:06 bcook Exp $ | 1 | .\" $OpenBSD: openssl.1,v 1.30 2015/12/24 16:54:37 mmcc Exp $ |
2 | .\" ==================================================================== | 2 | .\" ==================================================================== |
3 | .\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. | 3 | .\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -112,7 +112,7 @@ | |||
112 | .\" | 112 | .\" |
113 | .\" OPENSSL | 113 | .\" OPENSSL |
114 | .\" | 114 | .\" |
115 | .Dd $Mdocdate: September 21 2015 $ | 115 | .Dd $Mdocdate: December 24 2015 $ |
116 | .Dt OPENSSL 1 | 116 | .Dt OPENSSL 1 |
117 | .Os | 117 | .Os |
118 | .Sh NAME | 118 | .Sh NAME |
@@ -819,7 +819,7 @@ in the | |||
819 | section). | 819 | section). |
820 | .It Fl noemailDN | 820 | .It Fl noemailDN |
821 | The DN of a certificate can contain the EMAIL field if present in the | 821 | The DN of a certificate can contain the EMAIL field if present in the |
822 | request DN, however it is good policy just having the e-mail set into | 822 | request DN, however it is good policy just having the email set into |
823 | the | 823 | the |
824 | .Em altName | 824 | .Em altName |
825 | extension of the certificate. | 825 | extension of the certificate. |