Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TLMSP OpenSSL
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CYBER - Cyber Security
TS 103 523 MSP
TLMSP
TLMSP OpenSSL
Commits
223c59ea
Commit
223c59ea
authored
14 years ago
by
Dr. Stephen Henson
Browse files
Options
Downloads
Patches
Plain Diff
Fix WIN32 build system to correctly link ENGINE DLLs contained in a
directory: currently the GOST ENGINE is the only case.
parent
7bbd0de8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGES
+7
-0
7 additions, 0 deletions
CHANGES
util/mk1mf.pl
+16
-1
16 additions, 1 deletion
util/mk1mf.pl
with
23 additions
and
1 deletion
CHANGES
+
7
−
0
View file @
223c59ea
...
...
@@ -114,6 +114,13 @@
Add command line options to s_client/s_server.
[Steve Henson]
Changes between 1.0.0a and 1.0.0b [xx XXX xxxx]
*) Fix WIN32 build system to correctly link an ENGINE directory into
a DLL.
[Steve Henson]
Changes between 1.0.0 and 1.0.0a [xx XXX xxxx]
*) Check return value of int_rsa_verify in pkey_rsa_verifyrecover
...
...
This diff is collapsed.
Click to expand it.
util/mk1mf.pl
+
16
−
1
View file @
223c59ea
...
...
@@ -13,6 +13,7 @@ $banner="\t\@echo Building OpenSSL";
my
$no_static_engine
=
1
;
my
$engines
=
"";
my
$otherlibs
=
"";
local
$zlib_opt
=
0
;
# 0 = no zlib, 1 = static, 2 = dynamic
local
$zlib_lib
=
"";
local
$perl_asm
=
0
;
# 1 to autobuild asm files from perl scripts
...
...
@@ -356,6 +357,12 @@ for (;;)
$lib
=
$val
;
$lib
=~
s/^.*\/([^\/]+)$/$1/
;
}
if
(
$key
eq
"
LIBNAME
"
&&
$no_static_engine
)
{
$lib
=
$val
;
$lib
=~
s/^.*\/([^\/]+)$/$1/
;
$otherlibs
.=
"
$lib
";
}
if
(
$key
eq
"
EXHEADER
")
{
$exheader
.=
&var_add
(
$dir
,
$val
,
1
);
}
...
...
@@ -658,7 +665,7 @@ foreach (split(/\s+/,$test))
$rules
.=
&do_link_rule
("
\$
(TEST_D)
$o$t$exep
",
$tt
,"
\$
(LIBS_DEP)
","
\$
(L_LIBS)
\$
(EX_LIBS)
");
}
$defs
.=
&do_defs
("
E_SHLIB
",
$engines
,"
\$
(ENG_D)
",
$shlibp
);
$defs
.=
&do_defs
("
E_SHLIB
",
$engines
.
$otherlibs
,"
\$
(ENG_D)
",
$shlibp
);
foreach
(
split
(
/\s+/
,
$engines
))
{
...
...
@@ -671,6 +678,14 @@ foreach (split(/\s+/,$engines))
$rules
.=
&do_lib_rule
("
\$
(SSLOBJ)
","
\$
(O_SSL)
",
$ssl
,
$shlib
,"
\$
(SO_SSL)
");
$rules
.=
&do_lib_rule
("
\$
(CRYPTOOBJ)
","
\$
(O_CRYPTO)
",
$crypto
,
$shlib
,"
\$
(SO_CRYPTO)
");
foreach
(
split
(
/\s+/
,
$otherlibs
))
{
my
$uc
=
$_
;
$uc
=~
tr /a-z/A-Z/
;
$rules
.=
&do_lib_rule
("
\$
(
${uc}
OBJ)
","
\$
(ENG_D)
$o$_$shlibp
",
"",
$shlib
,
"");
}
$rules
.=
&do_link_rule
("
\$
(BIN_D)
$o
\$
(E_EXE)
$exep
","
\$
(E_OBJ)
","
\$
(LIBS_DEP)
","
\$
(L_LIBS)
\$
(EX_LIBS)
");
print
$defs
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment