Document -trusted_first option in man pages and help.

Add -trusted_first description to help messages and man pages
of tools that deal with certificate verification.

diff --git a/apps/cms.c b/apps/cms.c
index ddc3d5ec17554cb51b686cfad2b2decb90ae8c7d..bb85a200eda885524248bd2c7617c82b8aa92254 100644 (file)
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -716,6 +716,7 @@ int MAIN(int argc, char **argv)
                BIO_printf (bio_err, "-text          include or delete text MIME headers\n");
                BIO_printf (bio_err, "-CApath dir    trusted certificates directory\n");
                BIO_printf (bio_err, "-CAfile file   trusted certificates file\n");
+               BIO_printf (bio_err, "-trusted_first use locally trusted certificates first when building trust chain\n");
                BIO_printf (bio_err, "-crl_check     check revocation status of signer's certificate using CRLs\n");
                BIO_printf (bio_err, "-crl_check_all check revocation status of signer's certificate chain using CRLs\n");
 #ifndef OPENSSL_NO_ENGINE

diff --git a/apps/ocsp.c b/apps/ocsp.c
index 64c31826f3a97414e19ed13b102fd402dd01f9c3..7968e272d82d9224921b9a6714918daff9a437c2 100644 (file)
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -626,6 +626,7 @@ int MAIN(int argc, char **argv)
                BIO_printf (bio_err, "-path              path to use in OCSP request\n");
                BIO_printf (bio_err, "-CApath dir        trusted certificates directory\n");
                BIO_printf (bio_err, "-CAfile file       trusted certificates file\n");
+               BIO_printf (bio_err, "-trusted_first     use locally trusted CA's first when building trust chain\n");
                BIO_printf (bio_err, "-VAfile file       validator certificates file\n");
                BIO_printf (bio_err, "-validity_period n maximum validity discrepancy in seconds\n");
                BIO_printf (bio_err, "-status_age n      maximum status age in seconds\n");

diff --git a/apps/s_client.c b/apps/s_client.c
index eee0e2e77922053f4073749590fcc0d4b0c9a306..de6a984febf785d1839579580aaa27a34755898a 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -334,6 +334,7 @@ static void sc_usage(void)
        BIO_printf(bio_err," -pass arg     - private key file pass phrase source\n");
        BIO_printf(bio_err," -CApath arg   - PEM format directory of CA's\n");
        BIO_printf(bio_err," -CAfile arg   - PEM format file of CA's\n");
+       BIO_printf(bio_err," -trusted_first - Use local CA's first when building trust chain\n");
        BIO_printf(bio_err," -reconnect    - Drop and re-make the connection with the same Session-ID\n");
        BIO_printf(bio_err," -pause        - sleep(1) after each read(2) and write(2) system call\n");
        BIO_printf(bio_err," -showcerts    - show all certificates in the chain\n");

diff --git a/apps/s_server.c b/apps/s_server.c
index 7c4f7bc7d75493595c5a486f6762c742863a2a60..f890aac5b593f361af2071486acbfc083291a667 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -526,6 +526,7 @@ static void sv_usage(void)
        BIO_printf(bio_err," -state        - Print the SSL states\n");
        BIO_printf(bio_err," -CApath arg   - PEM format directory of CA's\n");
        BIO_printf(bio_err," -CAfile arg   - PEM format file of CA's\n");
+       BIO_printf(bio_err," -trusted_first - Use locally trusted CA's first when building trust chain\n");
        BIO_printf(bio_err," -nocert       - Don't use any certificates (Anon-DH)\n");
        BIO_printf(bio_err," -cipher arg   - play with 'openssl ciphers' to see what goes here\n");
        BIO_printf(bio_err," -serverpref   - Use server's cipher preferences\n");

diff --git a/apps/smime.c b/apps/smime.c
index d1ee48937e6d8b2b31fabc5ad09f9938423e413b..94c2884fed744f6265b10fe1dba0dfc6200a633f 100644 (file)
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -479,6 +479,7 @@ int MAIN(int argc, char **argv)
                BIO_printf (bio_err, "-text          include or delete text MIME headers\n");
                BIO_printf (bio_err, "-CApath dir    trusted certificates directory\n");
                BIO_printf (bio_err, "-CAfile file   trusted certificates file\n");
+               BIO_printf (bio_err, "-trusted_first use locally trusted CA's first when building trust chain\n");
                BIO_printf (bio_err, "-crl_check     check revocation status of signer's certificate using CRLs\n");
                BIO_printf (bio_err, "-crl_check_all check revocation status of signer's certificate chain using CRLs\n");
 #ifndef OPENSSL_NO_ENGINE

diff --git a/apps/verify.c b/apps/verify.c
index b754fe3e0844de86bb95e25eeaf93e1baecaadcf..b9480bd812ef2f046f9955e1a3eb5a19428ebce1 100644 (file)
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -245,7 +245,7 @@ int MAIN(int argc, char **argv)
 
 end:
        if (ret == 1) {
-               BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
+               BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-trusted_first] [-purpose purpose] [-crl_check]");
 #ifndef OPENSSL_NO_ENGINE
                BIO_printf(bio_err," [-engine e]");
 #endif

diff --git a/doc/apps/cms.pod b/doc/apps/cms.pod
index a1c896c1e3c32276c26a9f2cfcfb6892ea8ae09a..66be0bf2a57fbd083b8c6282509a49da2f0a4387 100644 (file)
--- a/doc/apps/cms.pod
+++ b/doc/apps/cms.pod
@@ -35,6 +35,7 @@ B<openssl> B<cms>
 [B<-print>]
 [B<-CAfile file>]
 [B<-CApath dir>]
+[B<-trusted_first>]
 [B<-md digest>]
 [B<-[cipher]>]
 [B<-nointern>]
@@ -429,9 +430,9 @@ portion of a message so they may be included manually. If signing
 then many S/MIME mail clients check the signers certificate's email
 address matches that specified in the From: address.
 
-=item B<-purpose, -ignore_critical, -issuer_checks, -crl_check, -crl_check_all, -policy_check, -extended_crl, -x509_strict, -policy -check_ss_sig>
+=item B<-purpose, -ignore_critical, -issuer_checks, -crl_check, -crl_check_all, -policy_check, -extended_crl, -x509_strict, -policy -check_ss_sig, -trusted_first>
 
-Set various certificate chain valiadition option. See the
+Set various certificate chain valiadition options. See the
 L<B<verify>|verify(1)> manual page for details.
 
 =back

diff --git a/doc/apps/ocsp.pod b/doc/apps/ocsp.pod
index af2e12e418bf43944e8419212e5cb99fe4099615..6939e55a2a92d97374e5f4dba8737c00784023d9 100644 (file)
--- a/doc/apps/ocsp.pod
+++ b/doc/apps/ocsp.pod
@@ -29,6 +29,7 @@ B<openssl> B<ocsp>
 [B<-path>]
 [B<-CApath dir>]
 [B<-CAfile file>]
+[B<-trusted_first>]
 [B<-VAfile file>]
 [B<-validity_period n>]
 [B<-status_age n>]
@@ -138,6 +139,11 @@ or "/" by default.
 file or pathname containing trusted CA certificates. These are used to verify
 the signature on the OCSP response.
 
+=item B<-trusted_first>
+
+Set certificate verification option.
+See L<B<verify>|verify(1)> manual page for details.
+
 =item B<-verify_other file>
 
 file containing additional certificates to search when attempting to locate

diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index 8964032cde212401418a1b6189003e669dddbef8..55c501e29dccf53544bc32c2cd66f67b2263ad48 100644 (file)
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -18,6 +18,7 @@ B<openssl> B<s_client>
 [B<-pass arg>]
 [B<-CApath directory>]
 [B<-CAfile filename>]
+[B<-trusted_first>]
 [B<-reconnect>]
 [B<-pause>]
 [B<-showcerts>]
@@ -116,9 +117,9 @@ also used when building the client certificate chain.
 A file containing trusted certificates to use during server authentication
 and to use when attempting to build the client certificate chain.
 
-=item B<-purpose, -ignore_critical, -issuer_checks, -crl_check, -crl_check_all, -policy_check, -extended_crl, -x509_strict, -policy -check_ss_sig>
+=item B<-purpose, -ignore_critical, -issuer_checks, -crl_check, -crl_check_all, -policy_check, -extended_crl, -x509_strict, -policy -check_ss_sig, -trusted_first>
 
-Set various certificate chain valiadition option. See the
+Set various certificate chain valiadition options. See the
 L<B<verify>|verify(1)> manual page for details.
 
 =item B<-reconnect>

diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod
index ad8dcdacef2125199ea2559de9f3bc0a4a1e3424..1de307a0ff4418294d6d4c80bb92cffd1ab1b6e7 100644 (file)
--- a/doc/apps/s_server.pod
+++ b/doc/apps/s_server.pod
@@ -34,6 +34,7 @@ B<openssl> B<s_server>
 [B<-state>]
 [B<-CApath directory>]
 [B<-CAfile filename>]
+[B<-trusted_first>]
 [B<-nocert>]
 [B<-cipher cipherlist>]
 [B<-quiet>]
@@ -183,6 +184,11 @@ and to use when attempting to build the server certificate chain. The list
 is also used in the list of acceptable client CAs passed to the client when
 a certificate is requested.
 
+=item B<-trusted_first>
+
+Set certificate verification option.
+See the L<B<verify>|verify(1)> manual page for details.
+
 =item B<-state>
 
 prints out the SSL session states.

diff --git a/doc/apps/smime.pod b/doc/apps/smime.pod
index d39a59a90d8cbae89063cdf231fef451666d2e87..cc6f3aeaa4847e008071b4ae9524303eb65e62d1 100644 (file)
--- a/doc/apps/smime.pod
+++ b/doc/apps/smime.pod
@@ -15,6 +15,7 @@ B<openssl> B<smime>
 [B<-pk7out>]
 [B<-[cipher]>]
 [B<-in file>]
+[B<-trusted_first>]
 [B<-certfile file>]
 [B<-signer file>]
 [B<-recip  file>]
@@ -259,7 +260,7 @@ portion of a message so they may be included manually. If signing
 then many S/MIME mail clients check the signers certificate's email
 address matches that specified in the From: address.
 
-=item B<-purpose, -ignore_critical, -issuer_checks, -crl_check, -crl_check_all, -policy_check, -extended_crl, -x509_strict, -policy -check_ss_sig>
+=item B<-purpose, -ignore_critical, -issuer_checks, -crl_check, -crl_check_all, -policy_check, -extended_crl, -x509_strict, -policy -check_ss_sig, -trusted_first>
 
 Set various options of certificate chain verification. See
 L<B<verify>|verify(1)> manual page for details.

diff --git a/doc/apps/verify.pod b/doc/apps/verify.pod
index f35d4029506aa44e45742bc716ea0be544054b22..764e617c3419593e010565f84c6d43b66629dfef 100644 (file)
--- a/doc/apps/verify.pod
+++ b/doc/apps/verify.pod
@@ -9,6 +9,7 @@ verify - Utility to verify certificates.
 B<openssl> B<verify>
 [B<-CApath directory>]
 [B<-CAfile file>]
+[B<-trusted_first>]
 [B<-purpose purpose>]
 [B<-policy arg>]
 [B<-ignore_critical>]
@@ -57,6 +58,12 @@ in PEM format concatenated together.
 A file of untrusted certificates. The file should contain multiple certificates
 in PEM format concatenated together.
 
+=item B<-trusted_first>
+
+Use certificates in CA file or CA directory before certificates in untrusted
+file when building the trust chain to verify certificates.
+This is mainly useful in environments with Bridge CA or Cross-Certified CAs.
+
 =item B<-purpose purpose>
 
 The intended use for the certificate. If this option is not specified,