From 170afce58d5c9ffc399892e19a52c5559e2db801 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Tue, 22 Jun 1999 13:33:22 +0000
Subject: New function PKCS7_signatureVerify to allow the signing certificate
 to be explicitly stated with PKCS#7 verify.

Also fix for util/mkerr.pl: if the -nostatic option is being used this will be
for an external library so the autogenerated C file should include the
header file as:
#include "any/path/to/header.h"
rather than the internal library form:
#include <openssl/header.h>
---
 util/mkerr.pl | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'util/mkerr.pl')

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 60a3028bc6..4b3bccb13e 100644
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -284,8 +284,14 @@ EOF
 
 	# Rewrite the C source file containing the error details.
 
-	$hfile =~ /([^\/]+)$/;
-	my $hincf = $1;
+	my $hincf;
+	if($static) {
+		$hfile =~ /([^\/]+)$/;
+		$hincf = "<openssl/$1>";
+	} else {
+		$hincf = "\"$hfile\"";
+	}
+
 
 	open (OUT,">$cfile") || die "Can't open $cfile for writing";
 
@@ -351,7 +357,7 @@ EOF
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include <openssl/$hincf>
+#include $hincf
 
 /* BEGIN ERROR CODES */
 #ifndef NO_ERR
-- 
cgit v1.2.3