From 6aaa942d530285ad51691c3ad1e0142dc7aa0b5b Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sun, 30 Oct 2011 11:40:54 +0000 Subject: [PATCH] Teach mkshared.com to have a look for disabled algorithms in opensslconf.h --- VMS/mkshared.com | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/VMS/mkshared.com b/VMS/mkshared.com index 794e1de62a..b0d1fdaac3 100644 --- a/VMS/mkshared.com +++ b/VMS/mkshared.com @@ -6,6 +6,7 @@ $! P2: Zlib object library path (optional). $! $! Input: [.UTIL]LIBEAY.NUM,[.xxx.EXE.CRYPTO]SSL_LIBCRYPTO[32].OLB $! [.UTIL]SSLEAY.NUM,[.xxx.EXE.SSL]SSL_LIBSSL[32].OLB +$! [.CRYPTO.xxx]OPENSSLCONF.H $! Output: [.xxx.EXE.CRYPTO]SSL_LIBCRYPTO_SHR[32].OPT,.MAP,.EXE $! [.xxx.EXE.SSL]SSL_LIBSSL_SRH[32].OPT,.MAP,.EXE $! @@ -70,6 +71,9 @@ $ endif $ endif $ endif $! +$! ----- Prepare info for processing: disabled algorithms info +$ gosub read_disabled_algorithms_info +$! $ ZLIB = p2 $ zlib_lib = "" $ if (ZLIB .nes. "") @@ -384,8 +388,7 @@ $ alg_i = alg_i + 1 $ if alg_entry .eqs. "" then goto loop2 $ if alg_entry .nes. "," $ then -$ if alg_entry .eqs. "KRB5" then goto loop ! Special for now -$ if alg_entry .eqs. "STATIC_ENGINE" then goto loop ! Special for now +$ if disabled_algorithms - ("," + alg_entry + ",") .nes disabled_algorithms then goto loop $ if f$trnlnm("OPENSSL_NO_"+alg_entry) .nes. "" then goto loop $ goto loop2 $ endif @@ -452,3 +455,22 @@ $ endif $ endloop_rvi: $ close vf $ return +$ +$! The disabled algorithms reader +$ read_disabled_algorithms_info: +$ disabled_algorithms = "," +$ open /read cf [.CRYPTO.'ARCH']OPENSSLCONF.H +$ loop_rci: +$ read/err=endloop_rci/end=endloop_rci cf rci_line +$ rci_line = f$edit(rci_line,"TRIM,COMPRESS") +$ rci_ei = 0 +$ if f$extract(0,9,rci_line) .eqs. "# define " then rci_ei = 2 +$ if f$extract(0,8,rci_line) .eqs. "#define " then rci_ei = 1 +$ if rci_ei .eq. 0 then goto loop_rci +$ rci_e = f$element(rci_ei," ",rci_line) +$ if f$extract(0,11,rci_e) .nes. "OPENSSL_NO_" then goto loop_rci +$ disabled_algorithms = disabled_algorithms + f$extract(11,999,rci_e) + "," +$ goto loop_rci +$ endloop_rci: +$ close cf +$ return -- 2.34.1