From 04705c1054e39ae7a56717eaf215186067478c27 Mon Sep 17 00:00:00 2001
From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Sat, 20 Nov 2010 09:50:41 -1000
Subject: [PATCH] OpenSSL: Reduce diffs to vendor source.

---
 crypto/openssl/crypto/cms/cms_env.c      | 2 +-
 crypto/openssl/crypto/cms/cms_sd.c       | 2 +-
 crypto/openssl/crypto/dh/dh_ameth.c      | 2 +-
 crypto/openssl/crypto/dh/dh_pmeth.c      | 2 +-
 crypto/openssl/crypto/dsa/dsa_ameth.c    | 2 +-
 crypto/openssl/crypto/dsa/dsa_pmeth.c    | 2 +-
 crypto/openssl/crypto/ec/ec_ameth.c      | 2 +-
 crypto/openssl/crypto/ec/ec_pmeth.c      | 2 +-
 crypto/openssl/crypto/engine/tb_asnmth.c | 2 +-
 crypto/openssl/crypto/evp/evp_pkey.c     | 2 +-
 crypto/openssl/crypto/evp/p_lib.c        | 2 +-
 crypto/openssl/crypto/evp/pmeth_lib.c    | 2 +-
 crypto/openssl/crypto/hmac/hm_ameth.c    | 2 +-
 crypto/openssl/crypto/hmac/hm_pmeth.c    | 2 +-
 crypto/openssl/crypto/pem/pem_lib.c      | 2 +-
 crypto/openssl/crypto/pem/pem_pkey.c     | 2 +-
 crypto/openssl/crypto/pkcs7/pk7_lib.c    | 2 +-
 crypto/openssl/crypto/rsa/rsa_ameth.c    | 2 +-
 crypto/openssl/crypto/rsa/rsa_pmeth.c    | 2 +-
 secure/lib/libcrypto/Makefile.inc        | 1 +
 20 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/crypto/openssl/crypto/cms/cms_env.c b/crypto/openssl/crypto/cms/cms_env.c
index 01963f3de7..b3237d4b94 100644
--- a/crypto/openssl/crypto/cms/cms_env.c
+++ b/crypto/openssl/crypto/cms/cms_env.c
@@ -60,7 +60,7 @@
 #include <openssl/rand.h>
 #include <openssl/aes.h>
 #include "cms_lcl.h"
-#include "../asn1/asn1_locl.h"
+#include "asn1_locl.h"
 
 /* CMS EnvelopedData Utilities */
 
diff --git a/crypto/openssl/crypto/cms/cms_sd.c b/crypto/openssl/crypto/cms/cms_sd.c
index dd2b759793..e3192b9c57 100644
--- a/crypto/openssl/crypto/cms/cms_sd.c
+++ b/crypto/openssl/crypto/cms/cms_sd.c
@@ -58,7 +58,7 @@
 #include <openssl/err.h>
 #include <openssl/cms.h>
 #include "cms_lcl.h"
-#include "../asn1/asn1_locl.h"
+#include "asn1_locl.h"
 
 /* CMS SignedData Utilities */
 
diff --git a/crypto/openssl/crypto/dh/dh_ameth.c b/crypto/openssl/crypto/dh/dh_ameth.c
index d73d6eb39f..377caf96c9 100644
--- a/crypto/openssl/crypto/dh/dh_ameth.c
+++ b/crypto/openssl/crypto/dh/dh_ameth.c
@@ -61,7 +61,7 @@
 #include <openssl/asn1.h>
 #include <openssl/dh.h>
 #include <openssl/bn.h>
-#include "../asn1/asn1_locl.h"
+#include "asn1_locl.h"
 
 static void int_dh_free(EVP_PKEY *pkey)
 	{
diff --git a/crypto/openssl/crypto/dh/dh_pmeth.c b/crypto/openssl/crypto/dh/dh_pmeth.c
index 943839a4e5..5ae72b7d4c 100644
--- a/crypto/openssl/crypto/dh/dh_pmeth.c
+++ b/crypto/openssl/crypto/dh/dh_pmeth.c
@@ -62,7 +62,7 @@
 #include <openssl/evp.h>
 #include <openssl/dh.h>
 #include <openssl/bn.h>
-#include "../evp/evp_locl.h"
+#include "evp_locl.h"
 
 /* DH pkey context structure */
 
diff --git a/crypto/openssl/crypto/dsa/dsa_ameth.c b/crypto/openssl/crypto/dsa/dsa_ameth.c
index 84c4e9a0b8..6413aae46e 100644
--- a/crypto/openssl/crypto/dsa/dsa_ameth.c
+++ b/crypto/openssl/crypto/dsa/dsa_ameth.c
@@ -64,7 +64,7 @@
 #ifndef OPENSSL_NO_CMS
 #include <openssl/cms.h>
 #endif
-#include "../asn1/asn1_locl.h"
+#include "asn1_locl.h"
 
 static int dsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
 	{
diff --git a/crypto/openssl/crypto/dsa/dsa_pmeth.c b/crypto/openssl/crypto/dsa/dsa_pmeth.c
index 270d777c99..4ce91e20c6 100644
--- a/crypto/openssl/crypto/dsa/dsa_pmeth.c
+++ b/crypto/openssl/crypto/dsa/dsa_pmeth.c
@@ -61,7 +61,7 @@
 #include <openssl/x509.h>
 #include <openssl/evp.h>
 #include <openssl/bn.h>
-#include "../evp/evp_locl.h"
+#include "evp_locl.h"
 #include "dsa_locl.h"
 
 /* DSA pkey context structure */
diff --git a/crypto/openssl/crypto/ec/ec_ameth.c b/crypto/openssl/crypto/ec/ec_ameth.c
index 3ad3f1a7db..c00f7d746c 100644
--- a/crypto/openssl/crypto/ec/ec_ameth.c
+++ b/crypto/openssl/crypto/ec/ec_ameth.c
@@ -63,7 +63,7 @@
 #ifndef OPENSSL_NO_CMS
 #include <openssl/cms.h>
 #endif
-#include "../asn1/asn1_locl.h"
+#include "asn1_locl.h"
 
 static int eckey_param2type(int *pptype, void **ppval, EC_KEY *ec_key)
 	{
diff --git a/crypto/openssl/crypto/ec/ec_pmeth.c b/crypto/openssl/crypto/ec/ec_pmeth.c
index add8d8b151..f433076ca1 100644
--- a/crypto/openssl/crypto/ec/ec_pmeth.c
+++ b/crypto/openssl/crypto/ec/ec_pmeth.c
@@ -62,7 +62,7 @@
 #include <openssl/ec.h>
 #include <openssl/ecdsa.h>
 #include <openssl/evp.h>
-#include "../evp/evp_locl.h"
+#include "evp_locl.h"
 
 /* EC pkey context structure */
 
diff --git a/crypto/openssl/crypto/engine/tb_asnmth.c b/crypto/openssl/crypto/engine/tb_asnmth.c
index 1e9f229132..75090339f7 100644
--- a/crypto/openssl/crypto/engine/tb_asnmth.c
+++ b/crypto/openssl/crypto/engine/tb_asnmth.c
@@ -53,7 +53,7 @@
  */
 
 #include "eng_int.h"
-#include "../asn1/asn1_locl.h"
+#include "asn1_locl.h"
 #include <openssl/evp.h>
 
 /* If this symbol is defined then ENGINE_get_pkey_asn1_meth_engine(), the
diff --git a/crypto/openssl/crypto/evp/evp_pkey.c b/crypto/openssl/crypto/evp/evp_pkey.c
index 7466144ef9..ceebf69284 100644
--- a/crypto/openssl/crypto/evp/evp_pkey.c
+++ b/crypto/openssl/crypto/evp/evp_pkey.c
@@ -61,7 +61,7 @@
 #include "cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/rand.h>
-#include "../asn1/asn1_locl.h"
+#include "asn1_locl.h"
 
 /* Extract a private key from a PKCS8 structure */
 
diff --git a/crypto/openssl/crypto/evp/p_lib.c b/crypto/openssl/crypto/evp/p_lib.c
index 51654b0dfd..1916c61699 100644
--- a/crypto/openssl/crypto/evp/p_lib.c
+++ b/crypto/openssl/crypto/evp/p_lib.c
@@ -78,7 +78,7 @@
 #include <openssl/engine.h>
 #endif
 
-#include "../asn1/asn1_locl.h"
+#include "asn1_locl.h"
 
 static void EVP_PKEY_free_it(EVP_PKEY *x);
 
diff --git a/crypto/openssl/crypto/evp/pmeth_lib.c b/crypto/openssl/crypto/evp/pmeth_lib.c
index 27e0c8df87..5481d4b8a5 100644
--- a/crypto/openssl/crypto/evp/pmeth_lib.c
+++ b/crypto/openssl/crypto/evp/pmeth_lib.c
@@ -64,7 +64,7 @@
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
-#include "../asn1/asn1_locl.h"
+#include "asn1_locl.h"
 #include "evp_locl.h"
 
 typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);
diff --git a/crypto/openssl/crypto/hmac/hm_ameth.c b/crypto/openssl/crypto/hmac/hm_ameth.c
index cdf55c5c6a..6d8a89149e 100644
--- a/crypto/openssl/crypto/hmac/hm_ameth.c
+++ b/crypto/openssl/crypto/hmac/hm_ameth.c
@@ -58,7 +58,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/evp.h>
-#include "../asn1/asn1_locl.h"
+#include "asn1_locl.h"
 
 #define HMAC_TEST_PRIVATE_KEY_FORMAT
 
diff --git a/crypto/openssl/crypto/hmac/hm_pmeth.c b/crypto/openssl/crypto/hmac/hm_pmeth.c
index ccbbba227d..985921ca1a 100644
--- a/crypto/openssl/crypto/hmac/hm_pmeth.c
+++ b/crypto/openssl/crypto/hmac/hm_pmeth.c
@@ -61,7 +61,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
-#include "../evp/evp_locl.h"
+#include "evp_locl.h"
 
 /* HMAC pkey context structure */
 
diff --git a/crypto/openssl/crypto/pem/pem_lib.c b/crypto/openssl/crypto/pem/pem_lib.c
index 09c1212223..cfc89a9921 100644
--- a/crypto/openssl/crypto/pem/pem_lib.c
+++ b/crypto/openssl/crypto/pem/pem_lib.c
@@ -66,7 +66,7 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/pkcs12.h>
-#include "../asn1/asn1_locl.h"
+#include "asn1_locl.h"
 #ifndef OPENSSL_NO_DES
 #include <openssl/des.h>
 #endif
diff --git a/crypto/openssl/crypto/pem/pem_pkey.c b/crypto/openssl/crypto/pem/pem_pkey.c
index 4576c599cc..8ecf24903b 100644
--- a/crypto/openssl/crypto/pem/pem_pkey.c
+++ b/crypto/openssl/crypto/pem/pem_pkey.c
@@ -68,7 +68,7 @@
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
-#include "../asn1/asn1_locl.h"
+#include "asn1_locl.h"
 
 int pem_check_suffix(const char *pem_str, const char *suffix);
 
diff --git a/crypto/openssl/crypto/pkcs7/pk7_lib.c b/crypto/openssl/crypto/pkcs7/pk7_lib.c
index 46ce68535d..d411269b50 100644
--- a/crypto/openssl/crypto/pkcs7/pk7_lib.c
+++ b/crypto/openssl/crypto/pkcs7/pk7_lib.c
@@ -60,7 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/x509.h>
-#include "../asn1/asn1_locl.h"
+#include "asn1_locl.h"
 
 long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
 	{
diff --git a/crypto/openssl/crypto/rsa/rsa_ameth.c b/crypto/openssl/crypto/rsa/rsa_ameth.c
index c46a9edb87..8c3209885e 100644
--- a/crypto/openssl/crypto/rsa/rsa_ameth.c
+++ b/crypto/openssl/crypto/rsa/rsa_ameth.c
@@ -65,7 +65,7 @@
 #ifndef OPENSSL_NO_CMS
 #include <openssl/cms.h>
 #endif
-#include "../asn1/asn1_locl.h"
+#include "asn1_locl.h"
 
 static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
 	{
diff --git a/crypto/openssl/crypto/rsa/rsa_pmeth.c b/crypto/openssl/crypto/rsa/rsa_pmeth.c
index 66d57a861f..c6892ecd09 100644
--- a/crypto/openssl/crypto/rsa/rsa_pmeth.c
+++ b/crypto/openssl/crypto/rsa/rsa_pmeth.c
@@ -63,7 +63,7 @@
 #include <openssl/rsa.h>
 #include <openssl/bn.h>
 #include <openssl/evp.h>
-#include "../evp/evp_locl.h"
+#include "evp_locl.h"
 #include "rsa_locl.h"
 
 /* RSA pkey context structure */
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index ead2237642..0396610eaf 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -9,6 +9,7 @@ LCRYPTO_DOC=	${LCRYPTO_SRC}/doc
 CFLAGS+=	-DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN -DTERMIOS
 CFLAGS+=	-DOPENSSL_THREADS
 CFLAGS+=	-I${LCRYPTO_SRC} -I${LCRYPTO_SRC}/crypto \
+		-I${LCRYPTO_SRC}/crypto/asn1 -I${LCRYPTO_SRC}/crypto/evp \
 		-I${LCRYPTO_SRC}/crypto/engine -I${.OBJDIR}
 
 MANDIR=	${SHAREDIR}/openssl/man/man
-- 
2.41.0