30aa93
diff -up openssl-1.0.1e/apps/apps.c.trusted-first openssl-1.0.1e/apps/apps.c
30aa93
--- openssl-1.0.1e/apps/apps.c.trusted-first	2013-02-11 16:26:04.000000000 +0100
9c324d
+++ openssl-1.0.1e/apps/apps.c	2013-08-16 15:42:39.920534769 +0200
30aa93
@@ -2361,6 +2361,8 @@ int args_verify(char ***pargs, int *parg
30aa93
 		flags |= X509_V_FLAG_NOTIFY_POLICY;
30aa93
 	else if (!strcmp(arg, "-check_ss_sig"))
30aa93
 		flags |= X509_V_FLAG_CHECK_SS_SIGNATURE;
30aa93
+	else if (!strcmp(arg, "-trusted_first"))
30aa93
+		flags |= X509_V_FLAG_TRUSTED_FIRST;
30aa93
 	else
30aa93
 		return 0;
30aa93
 
9c324d
diff -up openssl-1.0.1e/apps/cms.c.trusted-first openssl-1.0.1e/apps/cms.c
9c324d
--- openssl-1.0.1e/apps/cms.c.trusted-first	2013-02-11 16:26:04.000000000 +0100
9c324d
+++ openssl-1.0.1e/apps/cms.c	2013-08-16 15:43:56.671213879 +0200
9c324d
@@ -642,6 +642,7 @@ int MAIN(int argc, char **argv)
9c324d
 		BIO_printf (bio_err, "-text          include or delete text MIME headers\n");
9c324d
 		BIO_printf (bio_err, "-CApath dir    trusted certificates directory\n");
9c324d
 		BIO_printf (bio_err, "-CAfile file   trusted certificates file\n");
9c324d
+		BIO_printf (bio_err, "-trusted_first use trusted certificates first when building the trust chain\n");
9c324d
 		BIO_printf (bio_err, "-crl_check     check revocation status of signer's certificate using CRLs\n");
9c324d
 		BIO_printf (bio_err, "-crl_check_all check revocation status of signer's certificate chain using CRLs\n");
9c324d
 #ifndef OPENSSL_NO_ENGINE
9c324d
diff -up openssl-1.0.1e/apps/ocsp.c.trusted-first openssl-1.0.1e/apps/ocsp.c
9c324d
--- openssl-1.0.1e/apps/ocsp.c.trusted-first	2013-02-11 16:26:04.000000000 +0100
9c324d
+++ openssl-1.0.1e/apps/ocsp.c	2013-08-16 15:49:47.477572414 +0200
9c324d
@@ -595,6 +595,7 @@ int MAIN(int argc, char **argv)
9c324d
 		BIO_printf (bio_err, "-path              path to use in OCSP request\n");
9c324d
 		BIO_printf (bio_err, "-CApath dir        trusted certificates directory\n");
9c324d
 		BIO_printf (bio_err, "-CAfile file       trusted certificates file\n");
9c324d
+		BIO_printf (bio_err, "-trusted_first     use trusted certificates first when building the trust chain\n");
9c324d
 		BIO_printf (bio_err, "-VAfile file       validator certificates file\n");
9c324d
 		BIO_printf (bio_err, "-validity_period n maximum validity discrepancy in seconds\n");
9c324d
 		BIO_printf (bio_err, "-status_age n      maximum status age in seconds\n");
9c324d
diff -up openssl-1.0.1e/apps/s_client.c.trusted-first openssl-1.0.1e/apps/s_client.c
9c324d
--- openssl-1.0.1e/apps/s_client.c.trusted-first	2013-08-16 15:42:39.000000000 +0200
9c324d
+++ openssl-1.0.1e/apps/s_client.c	2013-08-16 15:49:00.727542994 +0200
9c324d
@@ -298,6 +298,7 @@ static void sc_usage(void)
9c324d
 	BIO_printf(bio_err," -pass arg     - private key file pass phrase source\n");
9c324d
 	BIO_printf(bio_err," -CApath arg   - PEM format directory of CA's\n");
9c324d
 	BIO_printf(bio_err," -CAfile arg   - PEM format file of CA's\n");
9c324d
+	BIO_printf(bio_err," -trusted_first - Use trusted CA's first when building the trust chain\n");
9c324d
 	BIO_printf(bio_err," -reconnect    - Drop and re-make the connection with the same Session-ID\n");
9c324d
 	BIO_printf(bio_err," -pause        - sleep(1) after each read(2) and write(2) system call\n");
9c324d
 	BIO_printf(bio_err," -showcerts    - show all certificates in the chain\n");
9c324d
diff -up openssl-1.0.1e/apps/smime.c.trusted-first openssl-1.0.1e/apps/smime.c
9c324d
--- openssl-1.0.1e/apps/smime.c.trusted-first	2013-02-11 16:26:04.000000000 +0100
9c324d
+++ openssl-1.0.1e/apps/smime.c	2013-08-16 15:46:44.024875150 +0200
9c324d
@@ -479,6 +479,7 @@ int MAIN(int argc, char **argv)
9c324d
 		BIO_printf (bio_err, "-text          include or delete text MIME headers\n");
9c324d
 		BIO_printf (bio_err, "-CApath dir    trusted certificates directory\n");
9c324d
 		BIO_printf (bio_err, "-CAfile file   trusted certificates file\n");
9c324d
+		BIO_printf (bio_err, "-trusted_first use trusted certificates first when building the trust chain\n");
9c324d
 		BIO_printf (bio_err, "-crl_check     check revocation status of signer's certificate using CRLs\n");
9c324d
 		BIO_printf (bio_err, "-crl_check_all check revocation status of signer's certificate chain using CRLs\n");
9c324d
 #ifndef OPENSSL_NO_ENGINE
9c324d
diff -up openssl-1.0.1e/apps/s_server.c.trusted-first openssl-1.0.1e/apps/s_server.c
9c324d
--- openssl-1.0.1e/apps/s_server.c.trusted-first	2013-08-16 15:42:39.000000000 +0200
9c324d
+++ openssl-1.0.1e/apps/s_server.c	2013-08-16 15:48:19.469634430 +0200
9c324d
@@ -501,6 +501,7 @@ static void sv_usage(void)
9c324d
 	BIO_printf(bio_err," -state        - Print the SSL states\n");
9c324d
 	BIO_printf(bio_err," -CApath arg   - PEM format directory of CA's\n");
9c324d
 	BIO_printf(bio_err," -CAfile arg   - PEM format file of CA's\n");
9c324d
+	BIO_printf(bio_err," -trusted_first - Use trusted CA's first when building the trust chain\n");
9c324d
 	BIO_printf(bio_err," -nocert       - Don't use any certificates (Anon-DH)\n");
9c324d
 	BIO_printf(bio_err," -cipher arg   - play with 'openssl ciphers' to see what goes here\n");
9c324d
 	BIO_printf(bio_err," -serverpref   - Use server's cipher preferences\n");
9c324d
diff -up openssl-1.0.1e/apps/s_time.c.trusted-first openssl-1.0.1e/apps/s_time.c
9c324d
--- openssl-1.0.1e/apps/s_time.c.trusted-first	2013-08-16 15:42:39.000000000 +0200
9c324d
+++ openssl-1.0.1e/apps/s_time.c	2013-08-16 15:47:35.862674188 +0200
9c324d
@@ -179,6 +179,7 @@ static void s_time_usage(void)
9c324d
                 file if not specified by this option\n\
9c324d
 -CApath arg   - PEM format directory of CA's\n\
9c324d
 -CAfile arg   - PEM format file of CA's\n\
9c324d
+-trusted_first - Use trusted CA's first when building the trust chain\n\
9c324d
 -cipher       - preferred cipher to use, play with 'openssl ciphers'\n\n";
9c324d
 
9c324d
 	printf( "usage: s_time <args>\n\n" );
9c324d
diff -up openssl-1.0.1e/apps/ts.c.trusted-first openssl-1.0.1e/apps/ts.c
9c324d
--- openssl-1.0.1e/apps/ts.c.trusted-first	2013-08-16 15:42:39.000000000 +0200
9c324d
+++ openssl-1.0.1e/apps/ts.c	2013-08-16 15:45:27.766206812 +0200
9c324d
@@ -383,7 +383,7 @@ int MAIN(int argc, char **argv)
9c324d
 		   "ts -verify [-data file_to_hash] [-digest digest_bytes] "
9c324d
 		   "[-queryfile request.tsq] "
9c324d
 		   "-in response.tsr [-token_in] "
9c324d
-		   "-CApath ca_path -CAfile ca_file.pem "
9c324d
+		   "-CApath ca_path -CAfile ca_file.pem -trusted_first"
9c324d
 		   "-untrusted cert_file.pem\n");
9c324d
  cleanup:
9c324d
 	/* Clean up. */
9c324d
diff -up openssl-1.0.1e/apps/verify.c.trusted-first openssl-1.0.1e/apps/verify.c
9c324d
--- openssl-1.0.1e/apps/verify.c.trusted-first	2013-02-11 16:26:04.000000000 +0100
9c324d
+++ openssl-1.0.1e/apps/verify.c	2013-08-16 15:46:09.720124654 +0200
9c324d
@@ -237,7 +237,7 @@ int MAIN(int argc, char **argv)
9c324d
 
9c324d
 end:
9c324d
 	if (ret == 1) {
9c324d
-		BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
9c324d
+		BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-trusted_first] [-purpose purpose] [-crl_check]");
9c324d
 		BIO_printf(bio_err," [-attime timestamp]");
9c324d
 #ifndef OPENSSL_NO_ENGINE
9c324d
 		BIO_printf(bio_err," [-engine e]");
30aa93
diff -up openssl-1.0.1e/crypto/x509/x509_vfy.c.trusted-first openssl-1.0.1e/crypto/x509/x509_vfy.c
9c324d
--- openssl-1.0.1e/crypto/x509/x509_vfy.c.trusted-first	2013-08-16 15:42:39.864533545 +0200
9c324d
+++ openssl-1.0.1e/crypto/x509/x509_vfy.c	2013-08-16 15:42:39.921534791 +0200
9c324d
@@ -207,6 +207,21 @@ int X509_verify_cert(X509_STORE_CTX *ctx
30aa93
 
30aa93
 		/* If we are self signed, we break */
30aa93
 		if (ctx->check_issued(ctx, x,x)) break;
30aa93
+		/* If asked see if we can find issuer in trusted store first */
30aa93
+		if (ctx->param->flags & X509_V_FLAG_TRUSTED_FIRST)
30aa93
+			{
30aa93
+			ok = ctx->get_issuer(&xtmp, ctx, x);
30aa93
+			if (ok < 0)
30aa93
+				return ok;
30aa93
+			/* If successful for now free up cert so it
30aa93
+			 * will be picked up again later.
30aa93
+			 */
30aa93
+			if (ok > 0)
30aa93
+				{
30aa93
+				X509_free(xtmp);
30aa93
+				break;
30aa93
+				}
30aa93
+			}
30aa93
 
30aa93
 		/* If we were passed a cert chain, use it first */
30aa93
 		if (ctx->untrusted != NULL)
30aa93
diff -up openssl-1.0.1e/crypto/x509/x509_vfy.h.trusted-first openssl-1.0.1e/crypto/x509/x509_vfy.h
9c324d
--- openssl-1.0.1e/crypto/x509/x509_vfy.h.trusted-first	2013-08-16 15:42:39.356522432 +0200
9c324d
+++ openssl-1.0.1e/crypto/x509/x509_vfy.h	2013-08-16 15:42:39.922534813 +0200
30aa93
@@ -389,6 +389,8 @@ void X509_STORE_CTX_set_depth(X509_STORE
30aa93
 #define X509_V_FLAG_USE_DELTAS			0x2000
30aa93
 /* Check selfsigned CA signature */
30aa93
 #define X509_V_FLAG_CHECK_SS_SIGNATURE		0x4000
30aa93
+/* Use trusted store first */
30aa93
+#define X509_V_FLAG_TRUSTED_FIRST		0x8000
30aa93
 
30aa93
 
30aa93
 #define X509_VP_FLAG_DEFAULT			0x1
9c324d
diff -up openssl-1.0.1e/doc/apps/cms.pod.trusted-first openssl-1.0.1e/doc/apps/cms.pod
9c324d
--- openssl-1.0.1e/doc/apps/cms.pod.trusted-first	2013-08-16 15:42:39.000000000 +0200
9c324d
+++ openssl-1.0.1e/doc/apps/cms.pod	2013-08-16 15:50:48.723921117 +0200
9c324d
@@ -35,6 +35,7 @@ B<openssl> B<cms>
9c324d
 [B<-print>]
9c324d
 [B<-CAfile file>]
9c324d
 [B<-CApath dir>]
9c324d
+[B<-trusted_first>]
9c324d
 [B<-md digest>]
9c324d
 [B<-[cipher]>]
9c324d
 [B<-nointern>]
9c324d
@@ -238,6 +239,12 @@ B<-verify>. This directory must be a sta
9c324d
 is a hash of each subject name (using B<x509 -hash="">) should be linked
9c324d
 to each certificate.
9c324d
 
9c324d
+=item B<-trusted_first>
9c324d
+
9c324d
+Use certificates in CA file or CA directory before untrusted certificates
9c324d
+from the message when building the trust chain to verify certificates.
9c324d
+This is mainly useful in environments with Bridge CA or Cross-Certified CAs.
9c324d
+
9c324d
 =item B<-md digest>
9c324d
 
9c324d
 digest algorithm to use when signing or resigning. If not present then the
9c324d
diff -up openssl-1.0.1e/doc/apps/ocsp.pod.trusted-first openssl-1.0.1e/doc/apps/ocsp.pod
9c324d
--- openssl-1.0.1e/doc/apps/ocsp.pod.trusted-first	2013-08-16 15:42:39.000000000 +0200
9c324d
+++ openssl-1.0.1e/doc/apps/ocsp.pod	2013-08-16 15:52:20.106933403 +0200
9c324d
@@ -29,6 +29,7 @@ B<openssl> B<ocsp>
9c324d
 [B<-path>]
9c324d
 [B<-CApath dir>]
9c324d
 [B<-CAfile file>]
9c324d
+[B<-trusted_first>]
9c324d
 [B<-VAfile file>]
9c324d
 [B<-validity_period n>]
9c324d
 [B<-status_age n>]
9c324d
@@ -138,6 +139,13 @@ or "/" by default.
9c324d
 file or pathname containing trusted CA certificates. These are used to verify
9c324d
 the signature on the OCSP response.
9c324d
 
9c324d
+=item B<-trusted_first>
9c324d
+
9c324d
+Use certificates in CA file or CA directory over certificates provided
9c324d
+in the response or residing in other certificates file when building the trust
9c324d
+chain to verify responder certificate.
9c324d
+This is mainly useful in environments with Bridge CA or Cross-Certified CAs.
9c324d
+
9c324d
 =item B<-verify_other file>
9c324d
 
9c324d
 file containing additional certificates to search when attempting to locate
9c324d
diff -up openssl-1.0.1e/doc/apps/s_client.pod.trusted-first openssl-1.0.1e/doc/apps/s_client.pod
9c324d
--- openssl-1.0.1e/doc/apps/s_client.pod.trusted-first	2013-08-16 15:42:39.000000000 +0200
9c324d
+++ openssl-1.0.1e/doc/apps/s_client.pod	2013-08-16 15:53:17.364194159 +0200
9c324d
@@ -17,6 +17,7 @@ B<openssl> B<s_client>
9c324d
 [B<-pass arg>]
9c324d
 [B<-CApath directory>]
9c324d
 [B<-CAfile filename>]
9c324d
+[B<-trusted_first>]
9c324d
 [B<-reconnect>]
9c324d
 [B<-pause>]
9c324d
 [B<-showcerts>]
9c324d
@@ -107,7 +108,7 @@ also used when building the client certi
9c324d
 A file containing trusted certificates to use during server authentication
9c324d
 and to use when attempting to build the client certificate chain.
9c324d
 
9c324d
-=item B<-purpose, -ignore_critical, -issuer_checks, -crl_check, -crl_check_all, -policy_check, -extended_crl, -x509_strict, -policy -check_ss_sig>
9c324d
+=item B<-purpose, -ignore_critical, -issuer_checks, -crl_check, -crl_check_all, -policy_check, -extended_crl, -x509_strict, -policy -check_ss_sig, -trusted_first>
9c324d
 
9c324d
 Set various certificate chain valiadition option. See the
9c324d
 L<b<verify>|verify(1)> manual page for details.
9c324d
diff -up openssl-1.0.1e/doc/apps/smime.pod.trusted-first openssl-1.0.1e/doc/apps/smime.pod
9c324d
--- openssl-1.0.1e/doc/apps/smime.pod.trusted-first	2013-08-16 15:42:39.000000000 +0200
9c324d
+++ openssl-1.0.1e/doc/apps/smime.pod	2013-08-16 15:56:12.497050767 +0200
9c324d
@@ -15,6 +15,9 @@ B<openssl> B<smime>
9c324d
 [B<-pk7out>]
9c324d
 [B<-[cipher]>]
9c324d
 [B<-in file>]
9c324d
+[B<-CAfile file>]
9c324d
+[B<-CApath dir>]
9c324d
+[B<-trusted_first>]
9c324d
 [B<-certfile file>]
9c324d
 [B<-signer file>]
9c324d
 [B<-recip  file>]
9c324d
@@ -146,6 +149,12 @@ B<-verify>. This directory must be a sta
9c324d
 is a hash of each subject name (using B<x509 -hash="">) should be linked
9c324d
 to each certificate.
9c324d
 
9c324d
+=item B<-trusted_first>
9c324d
+
9c324d
+Use certificates in CA file or CA directory over certificates provided
9c324d
+in the message when building the trust chain to verify a certificate.
9c324d
+This is mainly useful in environments with Bridge CA or Cross-Certified CAs.
9c324d
+
9c324d
 =item B<-md digest>
9c324d
 
9c324d
 digest algorithm to use when signing or resigning. If not present then the
9c324d
diff -up openssl-1.0.1e/doc/apps/s_server.pod.trusted-first openssl-1.0.1e/doc/apps/s_server.pod
9c324d
--- openssl-1.0.1e/doc/apps/s_server.pod.trusted-first	2013-08-16 15:42:39.000000000 +0200
9c324d
+++ openssl-1.0.1e/doc/apps/s_server.pod	2013-08-16 15:54:33.609873214 +0200
9c324d
@@ -33,6 +33,7 @@ B<openssl> B<s_server>
9c324d
 [B<-state>]
9c324d
 [B<-CApath directory>]
9c324d
 [B<-CAfile filename>]
9c324d
+[B<-trusted_first>]
9c324d
 [B<-nocert>]
9c324d
 [B<-cipher cipherlist>]
9c324d
 [B<-quiet>]
9c324d
@@ -168,6 +169,12 @@ and to use when attempting to build the
9c324d
 is also used in the list of acceptable client CAs passed to the client when
9c324d
 a certificate is requested.
9c324d
 
9c324d
+=item B<-trusted_first>
9c324d
+
9c324d
+Use certificates in CA file or CA directory before other certificates 
9c324d
+when building the trust chain to verify client certificates.
9c324d
+This is mainly useful in environments with Bridge CA or Cross-Certified CAs.
9c324d
+
9c324d
 =item B<-state>
9c324d
 
9c324d
 prints out the SSL session states.
9c324d
diff -up openssl-1.0.1e/doc/apps/s_time.pod.trusted-first openssl-1.0.1e/doc/apps/s_time.pod
9c324d
--- openssl-1.0.1e/doc/apps/s_time.pod.trusted-first	2013-02-11 16:02:48.000000000 +0100
9c324d
+++ openssl-1.0.1e/doc/apps/s_time.pod	2013-08-16 15:55:12.651732938 +0200
9c324d
@@ -14,6 +14,7 @@ B<openssl> B<s_time>
9c324d
 [B<-key filename>]
9c324d
 [B<-CApath directory>]
9c324d
 [B<-CAfile filename>]
9c324d
+[B<-trusted_first>]
9c324d
 [B<-reuse>]
9c324d
 [B<-new>]
9c324d
 [B<-verify depth>]
9c324d
@@ -76,6 +77,12 @@ also used when building the client certi
9c324d
 A file containing trusted certificates to use during server authentication
9c324d
 and to use when attempting to build the client certificate chain.
9c324d
 
9c324d
+=item B<-trusted_first>
9c324d
+
9c324d
+Use certificates in CA file or CA directory over the certificates provided
9c324d
+by the server when building the trust chain to verify server certificate.
9c324d
+This is mainly useful in environments with Bridge CA or Cross-Certified CAs.
9c324d
+
9c324d
 =item B<-new>
9c324d
 
9c324d
 performs the timing test using a new session ID for each connection.
9c324d
diff -up openssl-1.0.1e/doc/apps/ts.pod.trusted-first openssl-1.0.1e/doc/apps/ts.pod
9c324d
--- openssl-1.0.1e/doc/apps/ts.pod.trusted-first	2013-02-11 16:26:04.000000000 +0100
9c324d
+++ openssl-1.0.1e/doc/apps/ts.pod	2013-08-16 15:57:17.399479957 +0200
9c324d
@@ -46,6 +46,7 @@ B<-verify>
9c324d
 [B<-token_in>]
9c324d
 [B<-CApath> trusted_cert_path]
9c324d
 [B<-CAfile> trusted_certs.pem]
9c324d
+[B<-trusted_first>]
9c324d
 [B<-untrusted> cert_file.pem]
9c324d
 
9c324d
 =head1 DESCRIPTION
9c324d
@@ -324,6 +325,12 @@ L<verify(1)|verify(1)> for additional de
9c324d
 or B<-CApath> must be specified.
9c324d
 (Optional)
9c324d
 
9c324d
+=item B<-trusted_first>
9c324d
+
9c324d
+Use certificates in CA file or CA directory before other certificates
9c324d
+when building the trust chain to verify certificates.
9c324d
+This is mainly useful in environments with Bridge CA or Cross-Certified CAs.
9c324d
+
9c324d
 =item B<-untrusted> cert_file.pem
9c324d
 
9c324d
 Set of additional untrusted certificates in PEM format which may be
9c324d
diff -up openssl-1.0.1e/doc/apps/verify.pod.trusted-first openssl-1.0.1e/doc/apps/verify.pod
9c324d
--- openssl-1.0.1e/doc/apps/verify.pod.trusted-first	2013-02-11 16:26:04.000000000 +0100
9c324d
+++ openssl-1.0.1e/doc/apps/verify.pod	2013-08-16 15:58:00.267423925 +0200
9c324d
@@ -9,6 +9,7 @@ verify - Utility to verify certificates.
9c324d
 B<openssl> B<verify>
9c324d
 [B<-CApath directory>]
9c324d
 [B<-CAfile file>]
9c324d
+[B<-trusted_first>]
9c324d
 [B<-purpose purpose>]
9c324d
 [B<-policy arg>]
9c324d
 [B<-ignore_critical>]
9c324d
@@ -56,6 +57,12 @@ in PEM format concatenated together.
9c324d
 A file of untrusted certificates. The file should contain multiple certificates
9c324d
 in PEM format concatenated together.
9c324d
 
9c324d
+=item B<-trusted_first>
9c324d
+
9c324d
+Use certificates in CA file or CA directory before the certificates in the untrusted
9c324d
+file when building the trust chain to verify certificates.
9c324d
+This is mainly useful in environments with Bridge CA or Cross-Certified CAs.
9c324d
+
9c324d
 =item B<-purpose purpose>
9c324d
 
9c324d
 The intended use for the certificate. If this option is not specified,