{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1750145472, "reponame":"openssl", "desc":"OpenSSL", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl", "f":3, "items": [ {"schema":"libjg2-1", "cid":"d36e563ad50e9b319c22ab6feadcaafa", "commit": {"type":"commit", "time": 1521763328, "time_ofs": 60, "oid_tree": { "oid": "9c226bf23a5a65615dfeda68de4457385e9b44fc", "alias": []}, "oid":{ "oid": "c45bf277a1522a2eef94904f1c8ae18237c49a01", "alias": []}, "msg": "Move the handling of dso_scheme to dso_conf.h", "sig_commit": { "git_time": { "time": 1521763328, "offset": 60 }, "name": "Richard Levitte", "email": "levitte@openssl.org", "md5": "b737120f0642a6a5c30c6291e6170c77" }, "sig_author": { "git_time": { "time": 1521763328, "offset": 60 }, "name": "Richard Levitte", "email": "levitte@openssl.org", "md5": "b737120f0642a6a5c30c6291e6170c77" }}, "body": "Move the handling of dso_scheme to dso_conf.h\n\nThe macros resulting from the dso_scheme attribute were defined for\nlibraries only, but there's a test program that uses the macros as\nwell. The easier way is to move the handling of this macro to\ncrypto/include/internal/dso_conf.h and having the modules that need it\ninclude it.\n\nReviewed-by: Andy Polyakov \u003cappro@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/5733)\n" , "diff": "diff --git a/Configure b/Configure\nindex ce33f48..7a2ef9b 100755\n--- a/Configure\n+++ b/Configure\n@@ -1232,29 +1232,6 @@ if ($target \u003d~ /linux.*-mips/ \u0026\u0026 !$disabled{asm}\n \tunshift @{$config{cxxflags}}, $value if $config{CXX};\n }\n \n-# The DSO code currently always implements all functions so that no\n-# applications will have to worry about that from a compilation point\n-# of view. However, the \u0022method\u0022s may return zero unless that platform\n-# has support compiled in for them. Currently each method is enabled\n-# by a define \u0022DSO_\u003cname\u003e\u0022 ... we translate the \u0022dso_scheme\u0022 config\n-# string entry into using the following logic;\n-if (!$disabled{dso} \u0026\u0026 $target{dso_scheme} ne \u0022\u0022)\n-\t{\n-\t$target{dso_scheme} \u003d~ tr/[a-z]/[A-Z]/;\n-\tif ($target{dso_scheme} eq \u0022DLFCN\u0022)\n-\t\t{\n-\t\tunshift @{$config{lib_defines}}, \u0022DSO_DLFCN\u0022, \u0022HAVE_DLFCN_H\u0022;\n-\t\t}\n-\telsif ($target{dso_scheme} eq \u0022DLFCN_NO_H\u0022)\n-\t\t{\n-\t\tunshift @{$config{lib_defines}}, \u0022DSO_DLFCN\u0022;\n-\t\t}\n-\telse\n-\t\t{\n-\t\tunshift @{$config{lib_defines}}, \u0022DSO_$target{dso_scheme}\u0022;\n-\t\t}\n-\t}\n-\n # If threads aren't disabled, check how possible they are\n unless ($disabled{threads}) {\n if ($auto_threads) {\ndiff --git a/crypto/include/internal/dso_conf.h.in b/crypto/include/internal/dso_conf.h.in\nindex daa5e24..ded87ca 100644\n--- a/crypto/include/internal/dso_conf.h.in\n+++ b/crypto/include/internal/dso_conf.h.in\n@@ -10,6 +10,21 @@\n \n #ifndef HEADER_DSO_CONF_H\n # define HEADER_DSO_CONF_H\n-\n+{- output_off() if $disabled{dso} -}\n+{- # The DSO code currently always implements all functions so that no\n+ # applications will have to worry about that from a compilation point\n+ # of view. However, the \u0022method\u0022s may return zero unless that platform\n+ # has support compiled in for them. Currently each method is enabled\n+ # by a define \u0022DSO_\u003cname\u003e\u0022 ... we translate the \u0022dso_scheme\u0022 config\n+ # string entry into using the following logic;\n+ my $scheme \u003d uc $target{dso_scheme};\n+ my @macros \u003d ( \u0022DSO_$scheme\u0022 );\n+ if ($scheme eq 'DLFCN') {\n+ @macros \u003d ( \u0022DSO_DLFCN\u0022, \u0022HAVE_DLFCN_H\u0022 );\n+ } elsif ($scheme eq \u0022DLFCN_NO_H\u0022) {\n+ @macros \u003d ( \u0022DSO_DLFCN\u0022 );\n+ }\n+ join(\u0022\u005cn\u0022, map { \u0022# define $_\u0022 } @macros); -}\n # define DSO_EXTENSION \u0022{- $target{dso_extension} -}\u0022\n+{- output_on() if $disabled{dso} -}\n #endif\n","s":{"c":1750145472,"u": 41185}} ],"g": 42711,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}