diff options
author | djm <> | 2006-06-27 05:05:40 +0000 |
---|---|---|
committer | djm <> | 2006-06-27 05:05:40 +0000 |
commit | 4f828b924f54507141fb95ebe49dfcd261945e85 (patch) | |
tree | f6b05913ca6b34db73a343a7bb36d57ff4105356 /src/lib/libcrypto/util/pl | |
parent | 588543a0946f1dbf0f1dd5135f8f6447486dc183 (diff) | |
download | openbsd-4f828b924f54507141fb95ebe49dfcd261945e85.tar.gz openbsd-4f828b924f54507141fb95ebe49dfcd261945e85.tar.bz2 openbsd-4f828b924f54507141fb95ebe49dfcd261945e85.zip |
import of openssl-0.9.7j
Diffstat (limited to 'src/lib/libcrypto/util/pl')
-rw-r--r-- | src/lib/libcrypto/util/pl/BC-32.pl | 14 | ||||
-rw-r--r-- | src/lib/libcrypto/util/pl/OS2-EMX.pl | 1 | ||||
-rw-r--r-- | src/lib/libcrypto/util/pl/VC-32-GMAKE.pl | 222 | ||||
-rw-r--r-- | src/lib/libcrypto/util/pl/VC-32.pl | 99 |
4 files changed, 319 insertions, 17 deletions
diff --git a/src/lib/libcrypto/util/pl/BC-32.pl b/src/lib/libcrypto/util/pl/BC-32.pl index 897ae9d824..28869c868d 100644 --- a/src/lib/libcrypto/util/pl/BC-32.pl +++ b/src/lib/libcrypto/util/pl/BC-32.pl | |||
@@ -18,7 +18,7 @@ $out_def="out32"; | |||
18 | $tmp_def="tmp32"; | 18 | $tmp_def="tmp32"; |
19 | $inc_def="inc32"; | 19 | $inc_def="inc32"; |
20 | #enable max error messages, disable most common warnings | 20 | #enable max error messages, disable most common warnings |
21 | $cflags="-DWIN32_LEAN_AND_MEAN -q -w-aus -w-par -w-inl -c -tWC -tWM -DOPENSSL_SYSNAME_WIN32 -DL_ENDIAN -DDSO_WIN32 -D_stricmp=stricmp "; | 21 | $cflags="-DWIN32_LEAN_AND_MEAN -q -w-ccc -w-rch -w-pia -w-aus -w-par -w-inl -c -tWC -tWM -DOPENSSL_SYSNAME_WIN32 -DL_ENDIAN -DDSO_WIN32 -D_stricmp=stricmp -D_strnicmp=strnicmp "; |
22 | if ($debug) | 22 | if ($debug) |
23 | { | 23 | { |
24 | $cflags.="-Od -y -v -vi- -D_DEBUG"; | 24 | $cflags.="-Od -y -v -vi- -D_DEBUG"; |
@@ -51,7 +51,7 @@ $lfile=''; | |||
51 | $shlib_ex_obj=""; | 51 | $shlib_ex_obj=""; |
52 | $app_ex_obj="c0x32.obj"; | 52 | $app_ex_obj="c0x32.obj"; |
53 | 53 | ||
54 | $asm='nasmw -f obj'; | 54 | $asm='nasmw -f obj -d__omf__'; |
55 | $asm.=" /Zi" if $debug; | 55 | $asm.=" /Zi" if $debug; |
56 | $afile='-o'; | 56 | $afile='-o'; |
57 | 57 | ||
@@ -106,9 +106,13 @@ sub do_lib_rule | |||
106 | $ret.="$target: $objs\n"; | 106 | $ret.="$target: $objs\n"; |
107 | if (!$shlib) | 107 | if (!$shlib) |
108 | { | 108 | { |
109 | # $ret.="\t\$(RM) \$(O_$Name)\n"; | 109 | $ret.=<<___; |
110 | $ret.="\techo LIB $<\n"; | 110 | -\$(RM) $lfile$target |
111 | $ret.="\t&\$(MKLIB) $lfile$target -+\$**\n"; | 111 | \$(MKLIB) $lfile$target \@&&! |
112 | +\$(**: = &^ | ||
113 | +) | ||
114 | ! | ||
115 | ___ | ||
112 | } | 116 | } |
113 | else | 117 | else |
114 | { | 118 | { |
diff --git a/src/lib/libcrypto/util/pl/OS2-EMX.pl b/src/lib/libcrypto/util/pl/OS2-EMX.pl index 75d72ebbcb..8dbeaa7a08 100644 --- a/src/lib/libcrypto/util/pl/OS2-EMX.pl +++ b/src/lib/libcrypto/util/pl/OS2-EMX.pl | |||
@@ -68,6 +68,7 @@ if (!$no_asm && !$fips) | |||
68 | $sha1_asm_src="crypto/sha/asm/s1-os2.asm"; | 68 | $sha1_asm_src="crypto/sha/asm/s1-os2.asm"; |
69 | $rmd160_asm_obj="crypto/ripemd/asm/rm-os2$obj"; | 69 | $rmd160_asm_obj="crypto/ripemd/asm/rm-os2$obj"; |
70 | $rmd160_asm_src="crypto/ripemd/asm/rm-os2.asm"; | 70 | $rmd160_asm_src="crypto/ripemd/asm/rm-os2.asm"; |
71 | $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DOPENSSL_BN_ASM_PART_WORDS"; | ||
71 | } | 72 | } |
72 | 73 | ||
73 | if ($shlib) | 74 | if ($shlib) |
diff --git a/src/lib/libcrypto/util/pl/VC-32-GMAKE.pl b/src/lib/libcrypto/util/pl/VC-32-GMAKE.pl new file mode 100644 index 0000000000..b5bbcac6c2 --- /dev/null +++ b/src/lib/libcrypto/util/pl/VC-32-GMAKE.pl | |||
@@ -0,0 +1,222 @@ | |||
1 | #!/usr/local/bin/perl | ||
2 | # VCw32lib.pl - the file for Visual C++ 4.[01] for windows NT, static libraries | ||
3 | # | ||
4 | |||
5 | |||
6 | if ($fips && !$shlib) | ||
7 | { | ||
8 | $crypto="libeayfips32"; | ||
9 | $crypto_compat = "libeaycompat32.lib"; | ||
10 | } | ||
11 | else | ||
12 | { | ||
13 | $crypto="libeay32"; | ||
14 | } | ||
15 | $ssl= "ssleay32"; | ||
16 | |||
17 | $o='/'; | ||
18 | #$cp='copy nul+'; # Timestamps get stuffed otherwise | ||
19 | #$rm='del'; | ||
20 | |||
21 | $cp='cp'; | ||
22 | $rm='rm'; | ||
23 | |||
24 | $zlib_lib="zlib1.lib"; | ||
25 | |||
26 | # C compiler stuff | ||
27 | $cc='cl'; | ||
28 | $cflags=' -MD -W3 -WX -Ox -O2 -Ob2 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; | ||
29 | $cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 | ||
30 | $cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 | ||
31 | $lflags="-nologo -subsystem:console -machine:I386 -opt:ref"; | ||
32 | $mlflags=''; | ||
33 | |||
34 | $out_def="gmout32"; | ||
35 | $tmp_def="gmtmp32"; | ||
36 | $inc_def="gminc32"; | ||
37 | |||
38 | if ($debug) | ||
39 | { | ||
40 | $cflags=" -MDd -W3 -WX -Zi -Yd -Od -nologo -DOPENSSL_SYSNAME_WIN32 -D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG -DDSO_WIN32"; | ||
41 | $lflags.=" -debug"; | ||
42 | $mlflags.=' -debug'; | ||
43 | } | ||
44 | $cflags .= " -DOPENSSL_SYSNAME_WINNT" if $NT == 1; | ||
45 | |||
46 | $obj='.obj'; | ||
47 | $ofile="-Fo"; | ||
48 | |||
49 | # EXE linking stuff | ||
50 | $link="link"; | ||
51 | $efile="-out:"; | ||
52 | $exep='.exe'; | ||
53 | if ($no_sock) | ||
54 | { $ex_libs=""; } | ||
55 | else { $ex_libs="wsock32.lib user32.lib gdi32.lib"; } | ||
56 | |||
57 | # static library stuff | ||
58 | $mklib='lib'; | ||
59 | $ranlib=''; | ||
60 | $plib=""; | ||
61 | $libp=".lib"; | ||
62 | $shlibp=($shlib)?".dll":".lib"; | ||
63 | $lfile='-out:'; | ||
64 | |||
65 | $shlib_ex_obj=""; | ||
66 | $app_ex_obj="setargv.obj"; | ||
67 | if ($nasm) { | ||
68 | $asm='nasmw -f win32'; | ||
69 | $afile='-o '; | ||
70 | } else { | ||
71 | $asm='ml -Cp -coff -c -Cx'; | ||
72 | $asm.=" -Zi" if $debug; | ||
73 | $afile='-Fo'; | ||
74 | } | ||
75 | |||
76 | $bn_asm_obj=''; | ||
77 | $bn_asm_src=''; | ||
78 | $des_enc_obj=''; | ||
79 | $des_enc_src=''; | ||
80 | $bf_enc_obj=''; | ||
81 | $bf_enc_src=''; | ||
82 | |||
83 | if (!$no_asm && !$fips) | ||
84 | { | ||
85 | $bn_asm_obj='crypto/bn/asm/bn_win32.obj'; | ||
86 | $bn_asm_src='crypto/bn/asm/bn_win32.asm'; | ||
87 | $des_enc_obj='crypto/des/asm/d_win32.obj crypto/des/asm/y_win32.obj'; | ||
88 | $des_enc_src='crypto/des/asm/d_win32.asm crypto/des/asm/y_win32.asm'; | ||
89 | $bf_enc_obj='crypto/bf/asm/b_win32.obj'; | ||
90 | $bf_enc_src='crypto/bf/asm/b_win32.asm'; | ||
91 | $cast_enc_obj='crypto/cast/asm/c_win32.obj'; | ||
92 | $cast_enc_src='crypto/cast/asm/c_win32.asm'; | ||
93 | $rc4_enc_obj='crypto/rc4/asm/r4_win32.obj'; | ||
94 | $rc4_enc_src='crypto/rc4/asm/r4_win32.asm'; | ||
95 | $rc5_enc_obj='crypto/rc5/asm/r5_win32.obj'; | ||
96 | $rc5_enc_src='crypto/rc5/asm/r5_win32.asm'; | ||
97 | $md5_asm_obj='crypto/md5/asm/m5_win32.obj'; | ||
98 | $md5_asm_src='crypto/md5/asm/m5_win32.asm'; | ||
99 | $sha1_asm_obj='crypto/sha/asm/s1_win32.obj'; | ||
100 | $sha1_asm_src='crypto/sha/asm/s1_win32.asm'; | ||
101 | $rmd160_asm_obj='crypto/ripemd/asm/rm_win32.obj'; | ||
102 | $rmd160_asm_src='crypto/ripemd/asm/rm_win32.asm'; | ||
103 | $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM"; | ||
104 | } | ||
105 | |||
106 | if ($shlib) | ||
107 | { | ||
108 | $mlflags.=" $lflags -dll"; | ||
109 | # $cflags =~ s| -MD| -MT|; | ||
110 | $lib_cflag=" -D_WINDLL"; | ||
111 | $out_def="gmout32dll"; | ||
112 | $tmp_def="gmtmp32dll"; | ||
113 | } | ||
114 | |||
115 | $cflags.=" -Fd$out_def"; | ||
116 | |||
117 | sub do_lib_rule | ||
118 | { | ||
119 | local($objs,$target,$name,$shlib,$ign,$base_addr, $fips_get_sig, $fips_premain_src)=@_; | ||
120 | local($ret,$Name); | ||
121 | |||
122 | $taget =~ s/\//$o/g if $o ne '/'; | ||
123 | ($Name=$name) =~ tr/a-z/A-Z/; | ||
124 | my $base_arg; | ||
125 | if ($base_addr ne "") | ||
126 | { | ||
127 | $base_arg= " -base:$base_addr"; | ||
128 | } | ||
129 | else | ||
130 | { | ||
131 | $base_arg = ""; | ||
132 | } | ||
133 | |||
134 | |||
135 | # $target="\$(LIB_D)$o$target"; | ||
136 | if (!$shlib) | ||
137 | { | ||
138 | # $ret.="\t\$(RM) \$(O_$Name)\n"; | ||
139 | $ret.="$target: $objs\n"; | ||
140 | $ex =' advapi32.lib'; | ||
141 | $ret.="\t\$(MKLIB) $lfile$target $objs $ex\n\n"; | ||
142 | } | ||
143 | else | ||
144 | { | ||
145 | local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':''; | ||
146 | $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib'; | ||
147 | $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/; | ||
148 | if (defined $fips_get_sig) | ||
149 | { | ||
150 | $ret.="$target: \$(O_FIPSCANISTER) $objs $fips_get_sig\n"; | ||
151 | $ret.="\tFIPS_LINK=\$(LINK) "; | ||
152 | $ret.="FIPS_CC=\$(CC) "; | ||
153 | $ret.="FIPS_CC_ARGS=\"-Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\" "; | ||
154 | $ret.="FIPS_PREMAIN_DSO=$fips_get_sig "; | ||
155 | $ret.="FIPS_TARGET=$target "; | ||
156 | $ret.="FIPS_LIBDIR=\$(FIPSLIB_D) "; | ||
157 | $ret.="\$(FIPSLINK) \$(MLFLAGS) $base_arg $efile$target "; | ||
158 | $ret.="-def:ms/${Name}.def \$(SHLIB_EX_OBJ) $objs "; | ||
159 | $ret.="\$(OBJ_D)${o}fips_premain.obj $ex\n\n"; | ||
160 | } | ||
161 | else | ||
162 | { | ||
163 | $ret.="$target: $objs\n"; | ||
164 | $ret.="\t\$(LINK) \$(MLFLAGS) $base_arg $efile$target /def:ms/${Name}.def \$(SHLIB_EX_OBJ) $objs $ex\n\n"; | ||
165 | } | ||
166 | } | ||
167 | $ret.="\n"; | ||
168 | return($ret); | ||
169 | } | ||
170 | |||
171 | sub do_link_rule | ||
172 | { | ||
173 | local($target,$files,$dep_libs,$libs,$standalone)=@_; | ||
174 | local($ret,$_); | ||
175 | $file =~ s/\//$o/g if $o ne '/'; | ||
176 | $n=&bname($targer); | ||
177 | if ($standalone) | ||
178 | { | ||
179 | $ret.="$target: $files $dep_libs\n"; | ||
180 | $ret.="\t\$(LINK) \$(LFLAGS) $efile$target "; | ||
181 | $ret.="$files $libs\n\n"; | ||
182 | } | ||
183 | elsif ($fips && !$shlib) | ||
184 | { | ||
185 | $ret.="$target: \$(O_FIPSCANISTER) $files $dep_libs\n"; | ||
186 | $ret.="\tFIPS_LINK=\$(LINK) "; | ||
187 | $ret.="FIPS_CC=\$(CC) "; | ||
188 | $ret.="FIPS_CC_ARGS=\"-Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\" "; | ||
189 | $ret.="FIPS_PREMAIN_DSO= "; | ||
190 | $ret.="FIPS_TARGET=$target "; | ||
191 | $ret.="FIPS_LIBDIR=\$(FIPSLIB_D) "; | ||
192 | $ret.=" \$(FIPSLINK) \$(LFLAGS) $efile$target "; | ||
193 | $ret.="\$(APP_EX_OBJ) $files \$(OBJ_D)${o}fips_premain.obj $libs\n\n"; | ||
194 | } | ||
195 | else | ||
196 | { | ||
197 | $ret.="$target: $files $dep_libs\n"; | ||
198 | $ret.="\t\$(LINK) \$(LFLAGS) $efile$target "; | ||
199 | $ret.="\$(APP_EX_OBJ) $files $libs\n\n"; | ||
200 | } | ||
201 | $ret.="\n"; | ||
202 | return($ret); | ||
203 | } | ||
204 | |||
205 | sub do_rlink_rule | ||
206 | { | ||
207 | local($target,$files,$check_hash, $deps)=@_; | ||
208 | local($ret,$_); | ||
209 | |||
210 | $file =~ s/\//$o/g if $o ne '/'; | ||
211 | $n=&bname($targer); | ||
212 | $ret.="$target: $check_hash $files $deps\n"; | ||
213 | $ret.="\t\$(PERL) util${o}checkhash.pl -chdir fips-1.0 -program_path ..$o$check_hash\n"; | ||
214 | $ret.="\t\$(MKCANISTER) $target $files\n"; | ||
215 | $ret.="\t$check_hash $target > $target.sha1\n"; | ||
216 | $ret.="\t\$(CP) fips-1.0${o}fips_premain.c \$(FIPSLIB_D)\n"; | ||
217 | $ret.="\t$check_hash \$(FIPSLIB_D)${o}fips_premain.c > \$(FIPSLIB_D)${o}fips_premain.c.sha1\n\n"; | ||
218 | return($ret); | ||
219 | } | ||
220 | |||
221 | |||
222 | 1; | ||
diff --git a/src/lib/libcrypto/util/pl/VC-32.pl b/src/lib/libcrypto/util/pl/VC-32.pl index cf689b9feb..4e97dfa9af 100644 --- a/src/lib/libcrypto/util/pl/VC-32.pl +++ b/src/lib/libcrypto/util/pl/VC-32.pl | |||
@@ -3,15 +3,28 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | $ssl= "ssleay32"; | 5 | $ssl= "ssleay32"; |
6 | $crypto="libeay32"; | 6 | |
7 | if ($fips && !$shlib) | ||
8 | { | ||
9 | $crypto="libeayfips32"; | ||
10 | $crypto_compat = "libeaycompat32.lib"; | ||
11 | } | ||
12 | else | ||
13 | { | ||
14 | $crypto="libeay32"; | ||
15 | } | ||
7 | 16 | ||
8 | $o='\\'; | 17 | $o='\\'; |
9 | $cp='copy nul+'; # Timestamps get stuffed otherwise | 18 | $cp='copy nul+'; # Timestamps get stuffed otherwise |
10 | $rm='del'; | 19 | $rm='del'; |
11 | 20 | ||
21 | $zlib_lib="zlib1.lib"; | ||
22 | |||
12 | # C compiler stuff | 23 | # C compiler stuff |
13 | $cc='cl'; | 24 | $cc='cl'; |
14 | $cflags=' /MD /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; | 25 | $cflags=' /MD /W3 /WX /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; |
26 | $cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 | ||
27 | $cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 | ||
15 | $lflags="/nologo /subsystem:console /machine:I386 /opt:ref"; | 28 | $lflags="/nologo /subsystem:console /machine:I386 /opt:ref"; |
16 | $mlflags=''; | 29 | $mlflags=''; |
17 | 30 | ||
@@ -100,25 +113,56 @@ $cflags.=" /Fd$out_def"; | |||
100 | 113 | ||
101 | sub do_lib_rule | 114 | sub do_lib_rule |
102 | { | 115 | { |
103 | local($objs,$target,$name,$shlib)=@_; | 116 | local($objs,$target,$name,$shlib,$ign,$base_addr) = @_; |
104 | local($ret,$Name); | 117 | local($ret,$Name); |
105 | 118 | ||
106 | $taget =~ s/\//$o/g if $o ne '/'; | 119 | $taget =~ s/\//$o/g if $o ne '/'; |
107 | ($Name=$name) =~ tr/a-z/A-Z/; | 120 | ($Name=$name) =~ tr/a-z/A-Z/; |
121 | my $base_arg; | ||
122 | if ($base_addr ne "") | ||
123 | { | ||
124 | $base_arg= " /base:$base_addr"; | ||
125 | } | ||
126 | else | ||
127 | { | ||
128 | $base_arg = ""; | ||
129 | } | ||
130 | |||
108 | 131 | ||
109 | # $target="\$(LIB_D)$o$target"; | 132 | # $target="\$(LIB_D)$o$target"; |
110 | $ret.="$target: $objs\n"; | ||
111 | if (!$shlib) | 133 | if (!$shlib) |
112 | { | 134 | { |
113 | # $ret.="\t\$(RM) \$(O_$Name)\n"; | 135 | # $ret.="\t\$(RM) \$(O_$Name)\n"; |
136 | $ret.="$target: $objs\n"; | ||
114 | $ex =' advapi32.lib'; | 137 | $ex =' advapi32.lib'; |
138 | $ex.=" \$(FIPSLIB_D)${o}_chkstk.o" if $fips && $target =~ /O_CRYPTO/; | ||
115 | $ret.="\t\$(MKLIB) $lfile$target @<<\n $objs $ex\n<<\n"; | 139 | $ret.="\t\$(MKLIB) $lfile$target @<<\n $objs $ex\n<<\n"; |
116 | } | 140 | } |
117 | else | 141 | else |
118 | { | 142 | { |
119 | local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':''; | 143 | local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':''; |
120 | $ex.=' wsock32.lib gdi32.lib advapi32.lib'; | 144 | $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib'; |
121 | $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n"; | 145 | $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/; |
146 | if ($fips && $target =~ /O_CRYPTO/) | ||
147 | { | ||
148 | $ex.=" \$(FIPSLIB_D)${o}_chkstk.o"; | ||
149 | $ret.="$target: $objs \$(PREMAIN_DSO_EXE)\n"; | ||
150 | $ret.="\tSET FIPS_LINK=\$(LINK)\n"; | ||
151 | $ret.="\tSET FIPS_CC=\$(CC)\n"; | ||
152 | $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n"; | ||
153 | $ret.="\tSET PREMAIN_DSO_EXE=\$(PREMAIN_DSO_EXE)\n"; | ||
154 | $ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n"; | ||
155 | $ret.="\tSET FIPS_TARGET=$target\n"; | ||
156 | $ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n"; | ||
157 | $ret.="\t\$(FIPSLINK) \$(MLFLAGS) $base_arg $efile$target "; | ||
158 | $ret.="/def:ms/${Name}.def @<<\n \$(SHLIB_EX_OBJ) $objs "; | ||
159 | $ret.="\$(OBJ_D)${o}fips_premain.obj $ex\n<<\n"; | ||
160 | } | ||
161 | else | ||
162 | { | ||
163 | $ret.="$target: $objs\n"; | ||
164 | $ret.="\t\$(LINK) \$(MLFLAGS) $base_arg $efile$target /def:ms/${Name}.def @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n"; | ||
165 | } | ||
122 | } | 166 | } |
123 | $ret.="\n"; | 167 | $ret.="\n"; |
124 | return($ret); | 168 | return($ret); |
@@ -126,20 +170,51 @@ sub do_lib_rule | |||
126 | 170 | ||
127 | sub do_link_rule | 171 | sub do_link_rule |
128 | { | 172 | { |
129 | local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_; | 173 | local($target,$files,$dep_libs,$libs,$standalone)=@_; |
130 | local($ret,$_); | 174 | local($ret,$_); |
131 | |||
132 | $file =~ s/\//$o/g if $o ne '/'; | 175 | $file =~ s/\//$o/g if $o ne '/'; |
133 | $n=&bname($targer); | 176 | $n=&bname($targer); |
134 | $ret.="$target: $files $dep_libs\n"; | 177 | $ret.="$target: $files $dep_libs\n"; |
135 | $ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n"; | 178 | if ($standalone) |
136 | $ret.=" \$(APP_EX_OBJ) $files $libs\n<<\n"; | 179 | { |
137 | if (defined $sha1file) | 180 | $ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n\t"; |
181 | $ret.="\$(FIPSLIB_D)${o}_chkstk.o " if ($files =~ /O_FIPSCANISTER/); | ||
182 | $ret.="$files $libs\n<<\n"; | ||
183 | } | ||
184 | elsif ($fips && !$shlib) | ||
138 | { | 185 | { |
139 | $ret.=" $openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file"; | 186 | $ret.="\tSET FIPS_LINK=\$(LINK)\n"; |
187 | $ret.="\tSET FIPS_CC=\$(CC)\n"; | ||
188 | $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n"; | ||
189 | $ret.="\tSET PREMAIN_DSO_EXE=\n"; | ||
190 | $ret.="\tSET FIPS_TARGET=$target\n"; | ||
191 | $ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n"; | ||
192 | $ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n"; | ||
193 | $ret.=" \$(FIPSLINK) \$(LFLAGS) $efile$target @<<\n"; | ||
194 | $ret.=" \$(APP_EX_OBJ) $files \$(OBJ_D)${o}fips_premain.obj $libs\n<<\n"; | ||
140 | } | 195 | } |
196 | else | ||
197 | { | ||
198 | $ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n"; | ||
199 | $ret.=" \$(APP_EX_OBJ) $files $libs\n<<\n"; | ||
200 | } | ||
201 | $ret.="\n"; | ||
202 | return($ret); | ||
203 | } | ||
204 | |||
205 | sub do_rlink_rule | ||
206 | { | ||
207 | local($target,$files,$dep_libs,$libs)=@_; | ||
208 | local($ret,$_); | ||
209 | |||
210 | $file =~ s/\//$o/g if $o ne '/'; | ||
211 | $n=&bname($targer); | ||
212 | $ret.="$target: $files $dep_libs\n"; | ||
213 | $ret.=" \$(MKCANISTER) $target <<\n"; | ||
214 | $ret.="INPUT($files)\n<<\n"; | ||
141 | $ret.="\n"; | 215 | $ret.="\n"; |
142 | return($ret); | 216 | return($ret); |
143 | } | 217 | } |
144 | 218 | ||
219 | |||
145 | 1; | 220 | 1; |