VirtualBox

Ignore:
Timestamp:
Mar 3, 2022 7:17:34 PM (3 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
150325
Message:

libs/openssl-3.0.1: started applying and adjusting our OpenSSL changes to 3.0.1. bugref:10128

Location:
trunk/src/libs/openssl-3.0.1
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/libs/openssl-3.0.1

    • Property svn:mergeinfo
      •  

        old new  
        1212/vendor/openssl/1.1.1c:131722-131725
        1313/vendor/openssl/1.1.1k:145841-145843
         14/vendor/openssl/3.0.1:150323-150324
         15/vendor/openssl/current:147554-150322
  • trunk/src/libs/openssl-3.0.1/engines/asm/e_padlock-x86.pl

    r91772 r94082  
    22# Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved.
    33#
    4 # Licensed under the OpenSSL license (the "License").  You may not use
     4# Licensed under the Apache License 2.0 (the "License").  You may not use
    55# this file except in compliance with the License.  You can obtain a copy
    66# in the file LICENSE in the source distribution or at
     
    4343require "x86asm.pl";
    4444
    45 $output=pop;
    46 open STDOUT,">$output";
     45$output=pop and open STDOUT,">$output";
    4746
    4847&asm_init($ARGV[0]);
  • trunk/src/libs/openssl-3.0.1/engines/asm/e_padlock-x86_64.pl

    r91772 r94082  
    22# Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved.
    33#
    4 # Licensed under the OpenSSL license (the "License").  You may not use
     4# Licensed under the Apache License 2.0 (the "License").  You may not use
    55# this file except in compliance with the License.  You can obtain a copy
    66# in the file LICENSE in the source distribution or at
     
    2020# details.
    2121
    22 $flavour = shift;
    23 $output  = shift;
    24 if ($flavour =~ /\./) { $output = $flavour; undef $flavour; }
     22# $output is the last argument if it looks like a file (it has an extension)
     23# $flavour is the first argument if it doesn't look like a file
     24$output = $#ARGV >= 0 && $ARGV[$#ARGV] =~ m|\.\w+$| ? pop : undef;
     25$flavour = $#ARGV >= 0 && $ARGV[0] !~ m|\.| ? shift : undef;
    2526
    2627$win64=0; $win64=1 if ($flavour =~ /[nm]asm|mingw64/ || $output =~ /\.asm$/);
     
    3132die "can't locate x86_64-xlate.pl";
    3233
    33 open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";
     34open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\""
     35     or die "can't call $xlate: $!";
    3436*STDOUT=*OUT;
    3537
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