VirtualBox

Changeset 98391 in vbox for trunk/src/libs


Ignore:
Timestamp:
Feb 1, 2023 1:30:13 PM (2 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
155635
Message:

libs/openssl-3.0.7: *.kmk cleanup by scm. bugref:10348

Location:
trunk/src/libs/openssl-3.0.7
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/libs/openssl-3.0.7/Makefile.kmk

    r98103 r98391  
    7878#
    7979recreate-headers: $(PATH_SUB_CURRENT)/util/dofile.pl \
    80         $(OSSL_HDR_TEMPLATES) \
    81         recreate-providers-headers
     80                $(OSSL_HDR_TEMPLATES) \
     81                recreate-providers-headers
    8282        $(foreach header, $(OSSL_HDR_TEMPLATES), \
    8383            perl -I$(PATH_SUB_CURRENT) \

  • trunk/src/libs/openssl-3.0.7/crypto/Makefile.kmk

    r98241 r98391  
    133133 VBox-libcrypto-x86_EXTENDS = VBox-libcrypto
    134134 VBox-libcrypto-x86_SOURCES = $(filter %.c %.cpp,$(VBox-libcrypto_SOURCES)) \
    135         $(PATH_STAGE_LIB)/VBox-libproviders-x86$(VBOX_SUFF_LIB) \
    136         $(foreach sublib,$(VBOX_CRYPTO_SUBLIBS_X86), $($(sublib)_1_TARGET))
     135        $(PATH_STAGE_LIB)/VBox-libproviders-x86$(VBOX_SUFF_LIB) \
     136        $(foreach sublib,$(VBOX_CRYPTO_SUBLIBS_X86), $($(sublib)_1_TARGET))
    137137endif
    138138
    … …  
    142142# The extension pack libcrypto.
    143143#
    144 LIBRARIES += VBoxExtPack-libcrypto
    145 VBoxExtPack-libcrypto          = For the Oracle Extension Pack
    146 VBoxExtPack-libcrypto_EXTENDS = VBox-libcrypto
    147 VBoxExtPack-libcrypto_DEFS     = $(VBox-libcrypto_DEFS) VBOX_IN_EXTPACK
    148 VBoxExtPack-libcrypto_SOURCES = \
    149         $(filter %.c %.cpp,$(VBox-libcrypto_SOURCES)) \
    150         $(foreach sublib,$(VBOX_CRYPTO_SUBLIBS), $(VBoxExtPack-$(sublib)_1_TARGET))
    151 define def_VBoxExtPack_libcrypto_inherit
    152  LIBRARIES += VBoxExtPack-$(sublib)
    153  VBoxExtPack-$(sublib) = Oracle Extension Pack version of $(sublib)
    154  VBoxExtPack-$(sublib)_EXTENDS = $(sublib)
    155  VBoxExtPack-$(sublib)_EXTENDS_BY = appending
    156  VBoxExtPack-$(sublib)_DEFS = VBOX_IN_EXTPACK
    157  VBoxExtPack-$(sublib)_DEFPATH = $($(sublib)_DEFPATH)
     144 LIBRARIES += VBoxExtPack-libcrypto
     145 VBoxExtPack-libcrypto         = For the Oracle Extension Pack
     146 VBoxExtPack-libcrypto_EXTENDS = VBox-libcrypto
     147 VBoxExtPack-libcrypto_DEFS    = $(VBox-libcrypto_DEFS) VBOX_IN_EXTPACK
     148 VBoxExtPack-libcrypto_SOURCES = \
     149        $(filter %.c %.cpp,$(VBox-libcrypto_SOURCES)) \
     150        $(foreach sublib,$(VBOX_CRYPTO_SUBLIBS), $(VBoxExtPack-$(sublib)_1_TARGET))
     151 define def_VBoxExtPack_libcrypto_inherit
     152  LIBRARIES += VBoxExtPack-$(sublib)
     153  VBoxExtPack-$(sublib) = Oracle Extension Pack version of $(sublib)
     154  VBoxExtPack-$(sublib)_EXTENDS = $(sublib)
     155  VBoxExtPack-$(sublib)_EXTENDS_BY = appending
     156  VBoxExtPack-$(sublib)_DEFS = VBOX_IN_EXTPACK
     157  VBoxExtPack-$(sublib)_DEFPATH = $($(sublib)_DEFPATH)
    158158 ## @todo kBuild: DEFPATH isn't inherited! FIXME!
    159 endef
    160 $(foreach sublib,$(VBOX_CRYPTO_SUBLIBS), $(eval $(def_VBoxExtPack_libcrypto_inherit)))
     159 endef
     160 $(foreach sublib,$(VBOX_CRYPTO_SUBLIBS), $(eval $(def_VBoxExtPack_libcrypto_inherit)))
    161161
    162162endif # VBOX_NEED_EXTPACK_OPENSSL
    … …  
    167167# The build program libcrypto version.
    168168#
    169 LIBRARIES += VBoxBldProg-libcrypto
    170 VBoxBldProg-libcrypto          = For bldRTSignTool
    171 VBoxBldProg-libcrypto_EXTENDS = VBox-libcrypto
    172 VBoxBldProg-libcrypto_TEMPLATE = VBoxLibCryptoBldProg
    173 VBoxBldProg-libcrypto_DEFS     = $(VBox-libcrypto_DEFS)
    174 VBoxBldProg-libcrypto_SOURCES = \
    175         $(filter %.c %.cpp,$(VBox-libcrypto_SOURCES)) \
    176         $(PATH_STAGE_LIB)/VBoxBldProg-libproviders$(VBOX_SUFF_LIB) \
    177         $(foreach sublib,$(VBOX_CRYPTO_SUBLIBS), $(VBoxBldProg-$(sublib)_1_TARGET))
    178 define def_VBoxBldProg_libcrypto_inherit
    179  LIBRARIES += VBoxBldProg-$(sublib)
    180  VBoxBldProg-$(sublib) = bldRTSignTool version of $(sublib)
    181  VBoxBldProg-$(sublib)_EXTENDS    = $(sublib)
    182  VBoxBldProg-$(sublib)_EXTENDS_BY = appending
    183  VBoxBldProg-$(sublib)_TEMPLATE   = VBoxSubLibCryptoBldProg
    184  VBoxBldProg-$(sublib)_DEFPATH    = $($(sublib)_DEFPATH)
     169 LIBRARIES += VBoxBldProg-libcrypto
     170 VBoxBldProg-libcrypto         = For bldRTSignTool
     171 VBoxBldProg-libcrypto_EXTENDS = VBox-libcrypto
     172 VBoxBldProg-libcrypto_TEMPLATE = VBoxLibCryptoBldProg
     173 VBoxBldProg-libcrypto_DEFS    = $(VBox-libcrypto_DEFS)
     174 VBoxBldProg-libcrypto_SOURCES = \
     175        $(filter %.c %.cpp,$(VBox-libcrypto_SOURCES)) \
     176        $(PATH_STAGE_LIB)/VBoxBldProg-libproviders$(VBOX_SUFF_LIB) \
     177        $(foreach sublib,$(VBOX_CRYPTO_SUBLIBS), $(VBoxBldProg-$(sublib)_1_TARGET))
     178 define def_VBoxBldProg_libcrypto_inherit
     179  LIBRARIES += VBoxBldProg-$(sublib)
     180  VBoxBldProg-$(sublib) = bldRTSignTool version of $(sublib)
     181  VBoxBldProg-$(sublib)_EXTENDS   = $(sublib)
     182  VBoxBldProg-$(sublib)_EXTENDS_BY = appending
     183  VBoxBldProg-$(sublib)_TEMPLATE  = VBoxSubLibCryptoBldProg
     184  VBoxBldProg-$(sublib)_DEFPATH   = $($(sublib)_DEFPATH)
    185185 ## @todo kBuild: DEFPATH isn't inherited! FIXME!
    186 endef
    187 $(foreach sublib,$(VBOX_CRYPTO_SUBLIBS), $(eval $(def_VBoxBldProg_libcrypto_inherit)))
     186 endef
     187 $(foreach sublib,$(VBOX_CRYPTO_SUBLIBS), $(eval $(def_VBoxBldProg_libcrypto_inherit)))
    188188
    189189endif # VBOX_WITH_BLD_RTSIGNTOOL_SIGNING
    … …  
    194194#
    195195recreate-openssl-asm: $(VBOX_PATH_CRYPTO)/perlasm/x86asm.pl \
    196         $(VBOX_PATH_CRYPTO)/x86cpuid.pl \
    197         $(VBOX_PATH_CRYPTO)/x86_64cpuid.pl \
    198         recreate-aes-asm \
    199         recreate-bn-asm \
    200         recreate-chacha-asm \
    201         recreate-ec-asm \
    202         recreate-md5-asm \
    203         recreate-modes-asm \
    204         recreate-poly1305-asm \
    205         recreate-rc4-asm \
    206         recreate-sha-asm
     196                $(VBOX_PATH_CRYPTO)/x86cpuid.pl \
     197                $(VBOX_PATH_CRYPTO)/x86_64cpuid.pl \
     198                recreate-aes-asm \
     199                recreate-bn-asm \
     200                recreate-chacha-asm \
     201                recreate-ec-asm \
     202                recreate-md5-asm \
     203                recreate-modes-asm \
     204                recreate-poly1305-asm \
     205                recreate-rc4-asm \
     206                recreate-sha-asm
    207207        perl $(VBOX_PATH_CRYPTO)/x86cpuid.pl elf -fPIC $(VBOX_PATH_CRYPTO)/genasm-elf/x86cpuid.S
    208208        perl $(VBOX_PATH_CRYPTO)/x86_64cpuid.pl elf $(VBOX_PATH_CRYPTO)/genasm-elf/x86_64cpuid.S

  • trunk/src/libs/openssl-3.0.7/crypto/aes/Makefile.kmk

    r98229 r98391  
    4141ifdef VBOX_WITH_CRYPTO_ASM
    4242 crypto_aes_SOURCES.x86 += \
    43         $(VBOX_PATH_CRYPTO_GENASM)/aes-586.S \
    44         $(VBOX_PATH_CRYPTO_GENASM)/vpaes-x86.S \
    45         $(VBOX_PATH_CRYPTO_GENASM)/aesni-x86.S
     43        $(VBOX_PATH_CRYPTO_GENASM)/aes-586.S \
     44        $(VBOX_PATH_CRYPTO_GENASM)/vpaes-x86.S \
     45        $(VBOX_PATH_CRYPTO_GENASM)/aesni-x86.S
    4646 crypto_aes_SOURCES.amd64 += \
    47         $(VBOX_PATH_CRYPTO_GENASM)/aes-x86_64.S \
    48         $(VBOX_PATH_CRYPTO_GENASM)/vpaes-x86_64.S \
    49         $(VBOX_PATH_CRYPTO_GENASM)/bsaes-x86_64.S \
    50         $(VBOX_PATH_CRYPTO_GENASM)/aesni-x86_64.S \
    51         $(VBOX_PATH_CRYPTO_GENASM)/aesni-mb-x86_64.S \
    52         $(VBOX_PATH_CRYPTO_GENASM)/aesni-sha1-x86_64.S \
    53         $(VBOX_PATH_CRYPTO_GENASM)/aesni-sha256-x86_64.S
     47        $(VBOX_PATH_CRYPTO_GENASM)/aes-x86_64.S \
     48        $(VBOX_PATH_CRYPTO_GENASM)/vpaes-x86_64.S \
     49        $(VBOX_PATH_CRYPTO_GENASM)/bsaes-x86_64.S \
     50        $(VBOX_PATH_CRYPTO_GENASM)/aesni-x86_64.S \
     51        $(VBOX_PATH_CRYPTO_GENASM)/aesni-mb-x86_64.S \
     52        $(VBOX_PATH_CRYPTO_GENASM)/aesni-sha1-x86_64.S \
     53        $(VBOX_PATH_CRYPTO_GENASM)/aesni-sha256-x86_64.S
    5454else
    55   crypto_aes_SOURCES += \
    56         aes_core.c \
    57         aes_cbc.c
     55 crypto_aes_SOURCES += \
     56        aes_core.c \
     57        aes_cbc.c
    5858endif
    5959
    … …  
    6262
    6363recreate-aes-asm: $(VBOX_PATH_CRYPTO)/perlasm/x86asm.pl \
    64         $(VBOX_PATH_CRYPTO_AES)/asm/aes-586.pl \
    65         $(VBOX_PATH_CRYPTO_AES)/asm/vpaes-x86.pl \
    66         $(VBOX_PATH_CRYPTO_AES)/asm/aesni-x86.pl \
    67         $(VBOX_PATH_CRYPTO_AES)/asm/aes-x86_64.pl \
    68         $(VBOX_PATH_CRYPTO_AES)/asm/vpaes-x86_64.pl \
    69         $(VBOX_PATH_CRYPTO_AES)/asm/bsaes-x86_64.pl \
    70         $(VBOX_PATH_CRYPTO_AES)/asm/aesni-x86_64.pl \
    71         $(VBOX_PATH_CRYPTO_AES)/asm/aesni-mb-x86_64.pl \
    72         $(VBOX_PATH_CRYPTO_AES)/asm/aesni-sha1-x86_64.pl \
    73         $(VBOX_PATH_CRYPTO_AES)/asm/aesni-sha256-x86_64.pl
     64                $(VBOX_PATH_CRYPTO_AES)/asm/aes-586.pl \
     65                $(VBOX_PATH_CRYPTO_AES)/asm/vpaes-x86.pl \
     66                $(VBOX_PATH_CRYPTO_AES)/asm/aesni-x86.pl \
     67                $(VBOX_PATH_CRYPTO_AES)/asm/aes-x86_64.pl \
     68                $(VBOX_PATH_CRYPTO_AES)/asm/vpaes-x86_64.pl \
     69                $(VBOX_PATH_CRYPTO_AES)/asm/bsaes-x86_64.pl \
     70                $(VBOX_PATH_CRYPTO_AES)/asm/aesni-x86_64.pl \
     71                $(VBOX_PATH_CRYPTO_AES)/asm/aesni-mb-x86_64.pl \
     72                $(VBOX_PATH_CRYPTO_AES)/asm/aesni-sha1-x86_64.pl \
     73                $(VBOX_PATH_CRYPTO_AES)/asm/aesni-sha256-x86_64.pl
    7474        perl $(VBOX_PATH_CRYPTO_AES)/asm/aes-586.pl elf -fPIC $(VBOX_PATH_CRYPTO)/genasm-elf/aes-586.S
    7575        perl $(VBOX_PATH_CRYPTO_AES)/asm/vpaes-x86.pl elf -fPIC $(VBOX_PATH_CRYPTO)/genasm-elf/vpaes-x86.S

  • trunk/src/libs/openssl-3.0.7/crypto/bn/Makefile.kmk

    r98229 r98391  
    6969ifdef VBOX_WITH_CRYPTO_ASM
    7070 crypto_bn_SOURCES.x86 += \
    71         $(VBOX_PATH_CRYPTO_GENASM)/bn-586.S \
    72         $(VBOX_PATH_CRYPTO_GENASM)/co-586.S \
    73         $(VBOX_PATH_CRYPTO_GENASM)/x86-mont.S \
    74         $(VBOX_PATH_CRYPTO_GENASM)/x86-gf2m.S
     71        $(VBOX_PATH_CRYPTO_GENASM)/bn-586.S \
     72        $(VBOX_PATH_CRYPTO_GENASM)/co-586.S \
     73        $(VBOX_PATH_CRYPTO_GENASM)/x86-mont.S \
     74        $(VBOX_PATH_CRYPTO_GENASM)/x86-gf2m.S
    7575 crypto_bn_SOURCES.amd64 += \
    76         asm/x86_64-gcc.c \
    77         $(VBOX_PATH_CRYPTO_GENASM)/rsaz-avx2.S \
    78         $(VBOX_PATH_CRYPTO_GENASM)/rsaz-avx512.S \
    79         $(VBOX_PATH_CRYPTO_GENASM)/rsaz-x86_64.S \
    80         $(VBOX_PATH_CRYPTO_GENASM)/x86_64-gf2m.S \
    81         $(VBOX_PATH_CRYPTO_GENASM)/x86_64-mont.S \
    82         $(VBOX_PATH_CRYPTO_GENASM)/x86_64-mont5.S
    83 crypto_bn_DEFS.x86 += OPENSSL_BN_ASM_PART_WORDS
     76        asm/x86_64-gcc.c \
     77        $(VBOX_PATH_CRYPTO_GENASM)/rsaz-avx2.S \
     78        $(VBOX_PATH_CRYPTO_GENASM)/rsaz-avx512.S \
     79        $(VBOX_PATH_CRYPTO_GENASM)/rsaz-x86_64.S \
     80        $(VBOX_PATH_CRYPTO_GENASM)/x86_64-gf2m.S \
     81        $(VBOX_PATH_CRYPTO_GENASM)/x86_64-mont.S \
     82        $(VBOX_PATH_CRYPTO_GENASM)/x86_64-mont5.S
     83 crypto_bn_DEFS.x86 += OPENSSL_BN_ASM_PART_WORDS
    8484else
    8585 crypto_bn_SOURCES += bn_asm.c
    … …  
    8989
    9090recreate-bn-asm: $(VBOX_PATH_CRYPTO)/perlasm/x86asm.pl \
    91         $(VBOX_PATH_CRYPTO_BN)/asm/bn-586.pl \
    92         $(VBOX_PATH_CRYPTO_BN)/asm/co-586.pl \
    93         $(VBOX_PATH_CRYPTO_BN)/asm/x86-mont.pl \
    94         $(VBOX_PATH_CRYPTO_BN)/asm/x86-gf2m.pl \
    95         $(VBOX_PATH_CRYPTO_BN)/asm/rsaz-avx2.pl \
    96         $(VBOX_PATH_CRYPTO_BN)/asm/rsaz-avx512.pl \
    97         $(VBOX_PATH_CRYPTO_BN)/asm/rsaz-x86_64.pl \
    98         $(VBOX_PATH_CRYPTO_BN)/asm/x86_64-gf2m.pl \
    99         $(VBOX_PATH_CRYPTO_BN)/asm/x86_64-mont.pl \
    100         $(VBOX_PATH_CRYPTO_BN)/asm/x86_64-mont5.pl
     91                $(VBOX_PATH_CRYPTO_BN)/asm/bn-586.pl \
     92                $(VBOX_PATH_CRYPTO_BN)/asm/co-586.pl \
     93                $(VBOX_PATH_CRYPTO_BN)/asm/x86-mont.pl \
     94                $(VBOX_PATH_CRYPTO_BN)/asm/x86-gf2m.pl \
     95                $(VBOX_PATH_CRYPTO_BN)/asm/rsaz-avx2.pl \
     96                $(VBOX_PATH_CRYPTO_BN)/asm/rsaz-avx512.pl \
     97                $(VBOX_PATH_CRYPTO_BN)/asm/rsaz-x86_64.pl \
     98                $(VBOX_PATH_CRYPTO_BN)/asm/x86_64-gf2m.pl \
     99                $(VBOX_PATH_CRYPTO_BN)/asm/x86_64-mont.pl \
     100                $(VBOX_PATH_CRYPTO_BN)/asm/x86_64-mont5.pl
    101101        perl $(VBOX_PATH_CRYPTO_BN)/asm/bn-586.pl elf -fPIC $(VBOX_PATH_CRYPTO)/genasm-elf/bn-586.S
    102102        perl $(VBOX_PATH_CRYPTO_BN)/asm/co-586.pl elf -fPIC $(VBOX_PATH_CRYPTO)/genasm-elf/co-586.S

  • trunk/src/libs/openssl-3.0.7/crypto/chacha/Makefile.kmk

    r98229 r98391  
    3838#       $(VBOX_PATH_CRYPTO_GENASM)/chacha-x86_64.S
    3939#else
    40  crypto_chacha_SOURCES += chacha_enc.c
     40crypto_chacha_SOURCES += chacha_enc.c
    4141#endif
    4242$(evalcall VBOX_OPENSSL_X86,crypto_chacha)
    … …  
    4444
    4545recreate-chacha-asm: $(VBOX_PATH_CRYPTO)/perlasm/x86asm.pl \
    46         $(VBOX_PATH_CRYPTO_CHACHA)/asm/chacha-x86.pl \
    47         $(VBOX_PATH_CRYPTO_CHACHA)/asm/chacha-x86_64.pl
     46                $(VBOX_PATH_CRYPTO_CHACHA)/asm/chacha-x86.pl \
     47                $(VBOX_PATH_CRYPTO_CHACHA)/asm/chacha-x86_64.pl
    4848        perl $(VBOX_PATH_CRYPTO_CHACHA)/asm/chacha-x86.pl elf -fPIC $(VBOX_PATH_CRYPTO)/genasm-elf/chacha-x86.S
    4949        perl $(VBOX_PATH_CRYPTO_CHACHA)/asm/chacha-x86_64.pl elf $(VBOX_PATH_CRYPTO)/genasm-elf/chacha-x86_64.S

  • trunk/src/libs/openssl-3.0.7/crypto/ec/Makefile.kmk

    r98229 r98391  
    7575ifdef VBOX_WITH_CRYPTO_ASM
    7676 crypto_ec_SOURCES.x86 += \
    77         $(VBOX_PATH_CRYPTO_GENASM)/ecp_nistz256-x86.S
     77        $(VBOX_PATH_CRYPTO_GENASM)/ecp_nistz256-x86.S
    7878 crypto_ec_SOURCES.amd64 += \
    79         $(VBOX_PATH_CRYPTO_GENASM)/ecp_nistz256-x86_64.S \
    80         $(VBOX_PATH_CRYPTO_GENASM)/x25519-x86_64.S
     79        $(VBOX_PATH_CRYPTO_GENASM)/ecp_nistz256-x86_64.S \
     80        $(VBOX_PATH_CRYPTO_GENASM)/x25519-x86_64.S
    8181endif
    8282$(evalcall VBOX_OPENSSL_X86,crypto_ec)
    … …  
    8484
    8585recreate-ec-asm: $(VBOX_PATH_CRYPTO)/perlasm/x86asm.pl \
    86         $(VBOX_PATH_CRYPTO_EC)/asm/ecp_nistz256-x86.pl \
    87         $(VBOX_PATH_CRYPTO_EC)/asm/ecp_nistz256-x86_64.pl \
    88         $(VBOX_PATH_CRYPTO_EC)/asm/x25519-x86_64.pl
     86                $(VBOX_PATH_CRYPTO_EC)/asm/ecp_nistz256-x86.pl \
     87                $(VBOX_PATH_CRYPTO_EC)/asm/ecp_nistz256-x86_64.pl \
     88                $(VBOX_PATH_CRYPTO_EC)/asm/x25519-x86_64.pl
    8989        perl $(VBOX_PATH_CRYPTO_EC)/asm/ecp_nistz256-x86.pl elf -fPIC $(VBOX_PATH_CRYPTO)/genasm-elf/ecp_nistz256-x86.S
    9090        perl $(VBOX_PATH_CRYPTO_EC)/asm/ecp_nistz256-x86_64.pl elf $(VBOX_PATH_CRYPTO)/genasm-elf/ecp_nistz256-x86_64.S

  • trunk/src/libs/openssl-3.0.7/crypto/md5/Makefile.kmk

    r98229 r98391  
    3838ifdef VBOX_WITH_CRYPTO_ASM
    3939 crypto_ec_SOURCES.x86 += \
    40         $(VBOX_PATH_CRYPTO_GENASM)/md5-586.S
     40        $(VBOX_PATH_CRYPTO_GENASM)/md5-586.S
    4141 crypto_ec_SOURCES.amd64 += \
    42         $(VBOX_PATH_CRYPTO_GENASM)/md5-x86_64.S
     42        $(VBOX_PATH_CRYPTO_GENASM)/md5-x86_64.S
    4343endif
    4444$(evalcall VBOX_OPENSSL_X86,crypto_md5)
    … …  
    4646
    4747recreate-md5-asm: $(VBOX_PATH_CRYPTO)/perlasm/x86asm.pl \
    48         $(VBOX_PATH_CRYPTO_MD5)/asm/md5-586.pl \
    49         $(VBOX_PATH_CRYPTO_MD5)/asm/md5-x86_64.pl
     48                $(VBOX_PATH_CRYPTO_MD5)/asm/md5-586.pl \
     49                $(VBOX_PATH_CRYPTO_MD5)/asm/md5-x86_64.pl
    5050        perl $(VBOX_PATH_CRYPTO_MD5)/asm/md5-586.pl elf -fPIC $(VBOX_PATH_CRYPTO)/genasm-elf/md5-586.S
    5151        perl $(VBOX_PATH_CRYPTO_MD5)/asm/md5-x86_64.pl elf $(VBOX_PATH_CRYPTO)/genasm-elf/md5-x86_64.S

  • trunk/src/libs/openssl-3.0.7/crypto/modes/Makefile.kmk

    r98229 r98391  
    4646ifdef VBOX_WITH_CRYPTO_ASM
    4747 crypto_modes_SOURCES.x86 += \
    48         $(VBOX_PATH_CRYPTO_GENASM)/ghash-x86.S
     48        $(VBOX_PATH_CRYPTO_GENASM)/ghash-x86.S
    4949 crypto_modes_SOURCES.amd64 += \
    50         $(VBOX_PATH_CRYPTO_GENASM)/ghash-x86_64.S \
    51         $(VBOX_PATH_CRYPTO_GENASM)/aesni-gcm-x86_64.S
     50        $(VBOX_PATH_CRYPTO_GENASM)/ghash-x86_64.S \
     51        $(VBOX_PATH_CRYPTO_GENASM)/aesni-gcm-x86_64.S
    5252endif
    5353$(evalcall VBOX_OPENSSL_X86,crypto_modes)
    … …  
    5555
    5656recreate-modes-asm: $(VBOX_PATH_CRYPTO)/perlasm/x86asm.pl \
    57         $(VBOX_PATH_CRYPTO_MODES)/asm/ghash-x86.pl \
    58         $(VBOX_PATH_CRYPTO_MODES)/asm/ghash-x86_64.pl \
    59         $(VBOX_PATH_CRYPTO_MODES)/asm/aesni-gcm-x86_64.pl
     57                $(VBOX_PATH_CRYPTO_MODES)/asm/ghash-x86.pl \
     58                $(VBOX_PATH_CRYPTO_MODES)/asm/ghash-x86_64.pl \
     59                $(VBOX_PATH_CRYPTO_MODES)/asm/aesni-gcm-x86_64.pl
    6060        perl $(VBOX_PATH_CRYPTO_MODES)/asm/ghash-x86.pl elf -fPIC $(VBOX_PATH_CRYPTO)/genasm-elf/ghash-x86.S
    6161        perl $(VBOX_PATH_CRYPTO_MODES)/asm/ghash-x86_64.pl elf $(VBOX_PATH_CRYPTO)/genasm-elf/ghash-x86_64.S

  • trunk/src/libs/openssl-3.0.7/crypto/poly1305/Makefile.kmk

    r98229 r98391  
    3636ifdef VBOX_WITH_CRYPTO_ASM
    3737 crypto_poly1305_SOURCES.x86 += \
    38         $(VBOX_PATH_CRYPTO_GENASM)/poly1305-x86.S
     38        $(VBOX_PATH_CRYPTO_GENASM)/poly1305-x86.S
    3939 crypto_poly1305_SOURCES.amd64 += \
    40         $(VBOX_PATH_CRYPTO_GENASM)/poly1305-x86_64.S
     40        $(VBOX_PATH_CRYPTO_GENASM)/poly1305-x86_64.S
    4141endif
    4242$(evalcall VBOX_OPENSSL_X86,crypto_poly1305)
    4343
    4444recreate-poly1305-asm: $(VBOX_PATH_CRYPTO)/perlasm/x86asm.pl \
    45         $(VBOX_PATH_CRYPTO_POLY1305)/asm/poly1305-x86.pl \
    46         $(VBOX_PATH_CRYPTO_POLY1305)/asm/poly1305-x86_64.pl
     45                $(VBOX_PATH_CRYPTO_POLY1305)/asm/poly1305-x86.pl \
     46                $(VBOX_PATH_CRYPTO_POLY1305)/asm/poly1305-x86_64.pl
    4747        perl $(VBOX_PATH_CRYPTO_POLY1305)/asm/poly1305-x86.pl elf -fPIC $(VBOX_PATH_CRYPTO)/genasm-elf/poly1305-x86.S
    4848        perl $(VBOX_PATH_CRYPTO_POLY1305)/asm/poly1305-x86_64.pl elf $(VBOX_PATH_CRYPTO)/genasm-elf/poly1305-x86_64.S

  • trunk/src/libs/openssl-3.0.7/crypto/rc4/Makefile.kmk

    r98229 r98391  
    3434ifdef VBOX_WITH_CRYPTO_ASM
    3535 crypto_rc4_SOURCES.x86 += \
    36         $(VBOX_PATH_CRYPTO_GENASM)/rc4-586.S
     36        $(VBOX_PATH_CRYPTO_GENASM)/rc4-586.S
    3737 crypto_rc4_SOURCES.amd64 += \
    38         $(VBOX_PATH_CRYPTO_GENASM)/rc4-x86_64.S \
    39         $(VBOX_PATH_CRYPTO_GENASM)/rc4-md5-x86_64.S
     38        $(VBOX_PATH_CRYPTO_GENASM)/rc4-x86_64.S \
     39        $(VBOX_PATH_CRYPTO_GENASM)/rc4-md5-x86_64.S
    4040else
    4141 crypto_rc4_SOURCES += \
    42         rc4_enc.c \
    43         rc4_skey.c
     42        rc4_enc.c \
     43        rc4_skey.c
    4444endif
    4545$(evalcall VBOX_OPENSSL_X86,crypto_rc4)
    … …  
    4747
    4848recreate-rc4-asm: $(VBOX_PATH_CRYPTO)/perlasm/x86asm.pl \
    49         $(VBOX_PATH_CRYPTO_RC4)/asm/rc4-586.pl \
    50         $(VBOX_PATH_CRYPTO_RC4)/asm/rc4-x86_64.pl \
    51         $(VBOX_PATH_CRYPTO_RC4)/asm/rc4-md5-x86_64.pl
     49                $(VBOX_PATH_CRYPTO_RC4)/asm/rc4-586.pl \
     50                $(VBOX_PATH_CRYPTO_RC4)/asm/rc4-x86_64.pl \
     51                $(VBOX_PATH_CRYPTO_RC4)/asm/rc4-md5-x86_64.pl
    5252        perl $(VBOX_PATH_CRYPTO_RC4)/asm/rc4-586.pl elf -fPIC $(VBOX_PATH_CRYPTO)/genasm-elf/rc4-586.S
    5353        perl $(VBOX_PATH_CRYPTO_RC4)/asm/rc4-x86_64.pl elf $(VBOX_PATH_CRYPTO)/genasm-elf/rc4-x86_64.S

  • trunk/src/libs/openssl-3.0.7/crypto/sha/Makefile.kmk

    r98229 r98391  
    4040ifdef VBOX_WITH_CRYPTO_ASM
    4141 crypto_sha_SOURCES.x86 += \
    42         keccak1600.c \
    43         $(VBOX_PATH_CRYPTO_GENASM)/sha1-586.S \
    44         $(VBOX_PATH_CRYPTO_GENASM)/sha256-586.S \
    45         $(VBOX_PATH_CRYPTO_GENASM)/sha512-586.S
     42        keccak1600.c \
     43        $(VBOX_PATH_CRYPTO_GENASM)/sha1-586.S \
     44        $(VBOX_PATH_CRYPTO_GENASM)/sha256-586.S \
     45        $(VBOX_PATH_CRYPTO_GENASM)/sha512-586.S
    4646 crypto_sha_SOURCES.amd64 += \
    47         $(VBOX_PATH_CRYPTO_GENASM)/keccak1600-x86_64.S \
    48         $(VBOX_PATH_CRYPTO_GENASM)/sha1-x86_64.S \
    49         $(VBOX_PATH_CRYPTO_GENASM)/sha1-mb-x86_64.S \
    50         $(VBOX_PATH_CRYPTO_GENASM)/sha256-x86_64.S \
    51         $(VBOX_PATH_CRYPTO_GENASM)/sha256-mb-x86_64.S \
    52         $(VBOX_PATH_CRYPTO_GENASM)/sha512-x86_64.S
     47        $(VBOX_PATH_CRYPTO_GENASM)/keccak1600-x86_64.S \
     48        $(VBOX_PATH_CRYPTO_GENASM)/sha1-x86_64.S \
     49        $(VBOX_PATH_CRYPTO_GENASM)/sha1-mb-x86_64.S \
     50        $(VBOX_PATH_CRYPTO_GENASM)/sha256-x86_64.S \
     51        $(VBOX_PATH_CRYPTO_GENASM)/sha256-mb-x86_64.S \
     52        $(VBOX_PATH_CRYPTO_GENASM)/sha512-x86_64.S
    5353else
    5454 crypto_sha_SOURCES += \
    55         keccak1600.c
     55        keccak1600.c
    5656endif
    5757$(evalcall VBOX_OPENSSL_X86,crypto_sha)
    … …  
    5959
    6060recreate-sha-asm: $(VBOX_PATH_CRYPTO)/perlasm/x86asm.pl \
    61         $(VBOX_PATH_CRYPTO_SHA)/asm/sha1-586.pl \
    62         $(VBOX_PATH_CRYPTO_SHA)/asm/sha256-586.pl \
    63         $(VBOX_PATH_CRYPTO_SHA)/asm/sha512-586.pl \
    64         $(VBOX_PATH_CRYPTO_SHA)/asm/keccak1600-x86_64.pl \
    65         $(VBOX_PATH_CRYPTO_SHA)/asm/sha1-x86_64.pl \
    66         $(VBOX_PATH_CRYPTO_SHA)/asm/sha1-mb-x86_64.pl \
    67         $(VBOX_PATH_CRYPTO_SHA)/asm/sha512-x86_64.pl \
    68         $(VBOX_PATH_CRYPTO_SHA)/asm/sha256-mb-x86_64.pl
     61                $(VBOX_PATH_CRYPTO_SHA)/asm/sha1-586.pl \
     62                $(VBOX_PATH_CRYPTO_SHA)/asm/sha256-586.pl \
     63                $(VBOX_PATH_CRYPTO_SHA)/asm/sha512-586.pl \
     64                $(VBOX_PATH_CRYPTO_SHA)/asm/keccak1600-x86_64.pl \
     65                $(VBOX_PATH_CRYPTO_SHA)/asm/sha1-x86_64.pl \
     66                $(VBOX_PATH_CRYPTO_SHA)/asm/sha1-mb-x86_64.pl \
     67                $(VBOX_PATH_CRYPTO_SHA)/asm/sha512-x86_64.pl \
     68                $(VBOX_PATH_CRYPTO_SHA)/asm/sha256-mb-x86_64.pl
    6969        perl $(VBOX_PATH_CRYPTO_SHA)/asm/sha1-586.pl elf -fPIC $(VBOX_PATH_CRYPTO)/genasm-elf/sha1-586.S
    7070        perl $(VBOX_PATH_CRYPTO_SHA)/asm/sha256-586.pl elf -fPIC $(VBOX_PATH_CRYPTO)/genasm-elf/sha256-586.S

  • trunk/src/libs/openssl-3.0.7/crypto/sm2/Makefile.kmk

    r98229 r98391  
    3030
    3131if 0 # Disabled following OL's example.
    32 LIBRARIES += crypto_sm2
    33 crypto_sm2_TEMPLATE = SubLibCrypto
    34 crypto_sm2_DEFS = OPENSSL_NO_DEPRECATED
    35 crypto_sm2_SOURCES = \
    36         sm2_crypt.c \
    37         sm2_err.c \
    38         sm2_pmeth.c \
    39         sm2_sign.c
    40 $(evalcall VBOX_OPENSSL_X86,crypto_sm2)
     32 LIBRARIES += crypto_sm2
     33 crypto_sm2_TEMPLATE = SubLibCrypto
     34 crypto_sm2_DEFS = OPENSSL_NO_DEPRECATED
     35 crypto_sm2_SOURCES = \
     36        sm2_crypt.c \
     37        sm2_err.c \
     38        sm2_pmeth.c \
     39        sm2_sign.c
     40 $(evalcall VBOX_OPENSSL_X86,crypto_sm2)
    4141endif
    4242

  • trunk/src/libs/openssl-3.0.7/crypto/sm4/Makefile.kmk

    r98229 r98391  
    3030
    3131if 0 # Disabled following OL's example.
    32 LIBRARIES += crypto_sm4
    33 crypto_sm4_TEMPLATE = SubLibCrypto
    34 crypto_sm4_DEFS = OPENSSL_NO_DEPRECATED
    35 crypto_sm4_SOURCES = \
    36         sm4.c
    37 $(evalcall VBOX_OPENSSL_X86,crypto_sm4)
     32 LIBRARIES += crypto_sm4
     33 crypto_sm4_TEMPLATE = SubLibCrypto
     34 crypto_sm4_DEFS = OPENSSL_NO_DEPRECATED
     35 crypto_sm4_SOURCES = \
     36        sm4.c
     37 $(evalcall VBOX_OPENSSL_X86,crypto_sm4)
    3838endif
    3939

  • trunk/src/libs/openssl-3.0.7/providers/Makefile.kmk

    r98241 r98391  
    6565        nullprov.c \
    6666        prov_running.c
    67  VBox-libproviders_SOURCES += $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS), $($(sublib)_1_TARGET))
     67VBox-libproviders_SOURCES += $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS), $($(sublib)_1_TARGET))
    6868
    6969ifdef VBOX_WITH_32_ON_64_MAIN_API # 32-bit edition.
    … …  
    7272 VBox-libproviders-x86_EXTENDS = VBox-libproviders
    7373 VBox-libproviders-x86_SOURCES = $(filter %.c %.cpp,$(VBox-libproviders_SOURCES)) \
    74         $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS_X86), $($(sublib)_1_TARGET))
     74        $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS_X86), $($(sublib)_1_TARGET))
    7575endif
    7676
    … …  
    9090# The build program libproviders version.
    9191#
    92 LIBRARIES += VBoxBldProg-libproviders
    93 VBoxBldProg-libproviders          = For bldRTSignTool
    94 VBoxBldProg-libproviders_EXTENDS = VBox-libproviders
    95 VBoxBldProg-libproviders_TEMPLATE = VBoxLibCryptoBldProg
    96 VBoxBldProg-libproviders_SOURCES = \
    97         $(filter %.c,$(VBox-libproviders_SOURCES)) \
    98         $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS), $(VBoxBldProg-$(sublib)_1_TARGET))
     92 LIBRARIES += VBoxBldProg-libproviders
     93 VBoxBldProg-libproviders         = For bldRTSignTool
     94 VBoxBldProg-libproviders_EXTENDS = VBox-libproviders
     95 VBoxBldProg-libproviders_TEMPLATE = VBoxLibCryptoBldProg
     96 VBoxBldProg-libproviders_SOURCES = \
     97        $(filter %.c,$(VBox-libproviders_SOURCES)) \
     98        $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS), $(VBoxBldProg-$(sublib)_1_TARGET))
    9999
    100 define def_VBoxBldProg_libproviders_inherit
    101  LIBRARIES += VBoxBldProg-$(sublib)
    102  VBoxBldProg-$(sublib) = bldRTSignTool version of $(sublib)
    103  VBoxBldProg-$(sublib)_EXTENDS    = $(sublib)
    104  VBoxBldProg-$(sublib)_EXTENDS_BY = appending
    105  VBoxBldProg-$(sublib)_TEMPLATE   = VBoxSubLibCryptoBldProg
    106  VBoxBldProg-$(sublib)_DEFPATH    = $($(sublib)_DEFPATH)
     100 define def_VBoxBldProg_libproviders_inherit
     101  LIBRARIES += VBoxBldProg-$(sublib)
     102  VBoxBldProg-$(sublib) = bldRTSignTool version of $(sublib)
     103  VBoxBldProg-$(sublib)_EXTENDS   = $(sublib)
     104  VBoxBldProg-$(sublib)_EXTENDS_BY = appending
     105  VBoxBldProg-$(sublib)_TEMPLATE  = VBoxSubLibCryptoBldProg
     106  VBoxBldProg-$(sublib)_DEFPATH   = $($(sublib)_DEFPATH)
    107107 ## @todo kBuild: DEFPATH isn't inherited! FIXME!
    108 endef
    109 $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS), $(eval $(def_VBoxBldProg_libproviders_inherit)))
     108 endef
     109 $(foreach sublib,$(VBOX_CRYPTO_PROVIDERS_SUBLIBS), $(eval $(def_VBoxBldProg_libproviders_inherit)))
    110110
    111111endif # VBOX_WITH_BLD_RTSIGNTOOL_SIGNING
    … …  
    132132#
    133133recreate-providers-headers: $(VBOX_PATH_OPENSSL)/util/dofile.pl \
    134         $(OSSL_PROVIDERS_HDR_TEMPLATES) \
    135         recreate-providers-der-sources
     134                $(OSSL_PROVIDERS_HDR_TEMPLATES) \
     135                recreate-providers-der-sources
    136136        $(foreach header, $(OSSL_PROVIDERS_HDR_TEMPLATES), \
    137137            perl \

  • trunk/src/libs/openssl-3.0.7/providers/common/der/Makefile.kmk

    r98229 r98391  
    7171#
    7272recreate-providers-der-sources: $(VBOX_PATH_OPENSSL)/util/dofile.pl \
    73         $(OSSL_PROVIDERS_DER_SRC_TEMPLATES)
     73                $(OSSL_PROVIDERS_DER_SRC_TEMPLATES)
    7474        $(foreach src, $(OSSL_PROVIDERS_DER_SRC_TEMPLATES), \
    7575            perl \

  • trunk/src/libs/openssl-3.0.7/providers/implementations/rands/Makefile.kmk

    r98229 r98391  
    4242        seeding/rand_cpu_x86.c
    4343ifn1of ($(KBUILD_TARGET), win)
    44 providers_rands_SOURCES += \
    45         seeding/rand_unix.c
     44 providers_rands_SOURCES += \
     45        seeding/rand_unix.c
    4646else
    47 providers_rands_SOURCES += \
    48         seeding/rand_win.c
     47 providers_rands_SOURCES += \
     48        seeding/rand_win.c
    4949endif
    5050$(evalcall VBOX_OPENSSL_X86,providers_rands)
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette