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:
9 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/crypto/ec/asm/ecp_nistz256-armv4.pl

    r91772 r94082  
    22# Copyright 2015-2020 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
    … …  
    3434# operation. Keep in mind that +200% means 3x improvement.
    3535
    36 $flavour = shift;
    37 if ($flavour=~/\w[\w\-]*\.\w+$/) { $output=$flavour; undef $flavour; }
    38 else { while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {} }
     36# $output is the last argument if it looks like a file (it has an extension)
     37# $flavour is the first argument if it doesn't look like a file
     38$output = $#ARGV >= 0 && $ARGV[$#ARGV] =~ m|\.\w+$| ? pop : undef;
     39$flavour = $#ARGV >= 0 && $ARGV[0] !~ m|\.| ? shift : undef;
    3940
    4041if ($flavour && $flavour ne "void") {
    … …  
    4445    die "can't locate arm-xlate.pl";
    4546
    46     open STDOUT,"| \"$^X\" $xlate $flavour $output";
     47    open STDOUT,"| \"$^X\" $xlate $flavour \"$output\""
     48        or die "can't call  $xlate: $!";
    4749} else {
    48     open STDOUT,">$output";
     50    $output and open STDOUT,">$output";
    4951}
    5052
    … …  
    5254#include "arm_arch.h"
    5355
    54 .text
    5556#if defined(__thumb2__)
    5657.syntax unified
    … …  
    8182
    8283$code.=<<___;
     84.rodata
    8385.globl  ecp_nistz256_precomputed
    8486.type   ecp_nistz256_precomputed,%object
    … …  
    105107$code.=<<___;
    106108.size   ecp_nistz256_precomputed,.-ecp_nistz256_precomputed
     109
     110.text
    107111.align  5
    108112.LRR:   @ 2^512 mod P precomputed for NIST P256 polynomial

  • trunk/src/libs/openssl-3.0.1/crypto/ec/asm/ecp_nistz256-armv8.pl

    r91772 r94082  
    22# Copyright 2015-2020 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
    … …  
    3232# operation. Keep in mind that +400% means 5x improvement.
    3333
    34 $flavour = shift;
    35 while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {}
     34# $output is the last argument if it looks like a file (it has an extension)
     35# $flavour is the first argument if it doesn't look like a file
     36$output = $#ARGV >= 0 && $ARGV[$#ARGV] =~ m|\.\w+$| ? pop : undef;
     37$flavour = $#ARGV >= 0 && $ARGV[0] !~ m|\.| ? shift : undef;
    3638
    3739$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
    … …  
    4042die "can't locate arm-xlate.pl";
    4143
    42 open OUT,"| \"$^X\" $xlate $flavour $output";
     44open OUT,"| \"$^X\" $xlate $flavour \"$output\""
     45    or die "can't call $xlate: $!";
    4346*STDOUT=*OUT;
    4447
    … …  
    14801483////////////////////////////////////////////////////////////////////////
    14811484// void ecp_nistz256_ord_sqr_mont(uint64_t res[4], uint64_t a[4],
    1482 //                                int rep);
     1485//                                uint64_t rep);
    14831486.globl  ecp_nistz256_ord_sqr_mont
    14841487.type   ecp_nistz256_ord_sqr_mont,%function
    … …  
    16461649        ldp     x4,x5,[$inp]            // X
    16471650        ldp     x6,x7,[$inp,#16]
    1648         str     w4,[$out,#64*0-4]
     1651        stur    w4,[$out,#64*0-4]
    16491652        lsr     x4,x4,#32
    16501653        str     w5,[$out,#64*1-4]
    … …  
    16621665        ldp     x4,x5,[$inp,#32]        // Y
    16631666        ldp     x6,x7,[$inp,#48]
    1664         str     w4,[$out,#64*0-4]
     1667        stur    w4,[$out,#64*0-4]
    16651668        lsr     x4,x4,#32
    16661669        str     w5,[$out,#64*1-4]
    … …  
    16781681        ldp     x4,x5,[$inp,#64]        // Z
    16791682        ldp     x6,x7,[$inp,#80]
    1680         str     w4,[$out,#64*0-4]
     1683        stur    w4,[$out,#64*0-4]
    16811684        lsr     x4,x4,#32
    16821685        str     w5,[$out,#64*1-4]

  • trunk/src/libs/openssl-3.0.1/crypto/ec/asm/ecp_nistz256-ppc64.pl

    r91772 r94082  
    22# Copyright 2016-2020 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
    … …  
    2626# POWER8                +220-340%
    2727
    28 $flavour = shift;
    29 while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {}
     28# $output is the last argument if it looks like a file (it has an extension)
     29# $flavour is the first argument if it doesn't look like a file
     30$output = $#ARGV >= 0 && $ARGV[$#ARGV] =~ m|\.\w+$| ? pop : undef;
     31$flavour = $#ARGV >= 0 && $ARGV[0] !~ m|\.| ? shift : undef;
    3032
    3133$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
    … …  
    3436die "can't locate ppc-xlate.pl";
    3537
    36 open OUT,"| \"$^X\" $xlate $flavour $output";
     38open OUT,"| \"$^X\" $xlate $flavour \"$output\""
     39    or die "can't call $xlate: $!";
    3740*STDOUT=*OUT;
    3841
    … …  
    19201923################################################################################
    19211924# void ecp_nistz256_ord_sqr_mont(uint64_t res[4], uint64_t a[4],
    1922 #                                int rep);
     1925#                                uint64_t rep);
    19231926.globl  ecp_nistz256_ord_sqr_mont
    19241927.align  5

  • trunk/src/libs/openssl-3.0.1/crypto/ec/asm/ecp_nistz256-sparcv9.pl

    r91772 r94082  
    11#! /usr/bin/env perl
    2 # Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
     2# Copyright 2015-2021 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
    … …  
    3232# operation. Keep in mind that +200% means 3x improvement.
    3333
    34 $output = pop;
    35 open STDOUT,">$output";
    36 
    37 $code.=<<___;
    38 #include "sparc_arch.h"
     34$output = pop and open STDOUT,">$output";
     35
     36$code.=<<___;
     37#ifndef __ASSEMBLER__
     38# define __ASSEMBLER__ 1
     39#endif
     40#include "crypto/sparc_arch.h"
    3941
    4042#define LOCALS  (STACK_BIAS+STACK_FRAME)

  • trunk/src/libs/openssl-3.0.1/crypto/ec/asm/ecp_nistz256-x86.pl

    r91772 r94082  
    22# Copyright 2015-2020 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],$ARGV[$#ARGV] eq "386");

  • trunk/src/libs/openssl-3.0.1/crypto/ec/asm/ecp_nistz256-x86_64.pl

    r91772 r94082  
    44# Copyright (c) 2015 CloudFlare, Inc.
    55#
    6 # Licensed under the OpenSSL license (the "License").  You may not use
     6# Licensed under the Apache License 2.0 (the "License").  You may not use
    77# this file except in compliance with the License.  You can obtain a copy
    88# in the file LICENSE in the source distribution or at
    … …  
    4141# Keep in mind that +100% means 2x improvement.
    4242
    43 $flavour = shift;
    44 $output  = shift;
    45 if ($flavour =~ /\./) { $output = $flavour; undef $flavour; }
     43# $output is the last argument if it looks like a file (it has an extension)
     44# $flavour is the first argument if it doesn't look like a file
     45$output = $#ARGV >= 0 && $ARGV[$#ARGV] =~ m|\.\w+$| ? pop : undef;
     46$flavour = $#ARGV >= 0 && $ARGV[0] !~ m|\.| ? shift : undef;
    4647
    4748$win64=0; $win64=1 if ($flavour =~ /[nm]asm|mingw64/ || $output =~ /\.asm$/);
    … …  
    5253die "can't locate x86_64-xlate.pl";
    5354
    54 open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";
     55open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\""
     56    or die "can't call $xlate: $!";
    5557*STDOUT=*OUT;
    5658
    … …  
    827829#   uint64_t res[4],
    828830#   uint64_t a[4],
    829 #   int rep);
     831#   uint64_t rep);
    830832
    831833.globl  ecp_nistz256_ord_sqr_mont

  • trunk/src/libs/openssl-3.0.1/crypto/ec/asm/x25519-ppc64.pl

    r91772 r94082  
    22# Copyright 2018-2020 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
    … …  
    2828# from 12% to 30% improvement was measured...
    2929
    30 $flavour = shift;
    31 while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {}
     30# $output is the last argument if it looks like a file (it has an extension)
     31# $flavour is the first argument if it doesn't look like a file
     32$output = $#ARGV >= 0 && $ARGV[$#ARGV] =~ m|\.\w+$| ? pop : undef;
     33$flavour = $#ARGV >= 0 && $ARGV[0] !~ m|\.| ? shift : undef;
    3234
    3335$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
    … …  
    3638die "can't locate ppc-xlate.pl";
    3739
    38 open OUT,"| \"$^X\" $xlate $flavour $output";
     40open OUT,"| \"$^X\" $xlate $flavour \"$output\""
     41    or die "can't call $xlate: $!";
    3942*STDOUT=*OUT;
    4043

  • trunk/src/libs/openssl-3.0.1/crypto/ec/asm/x25519-x86_64.pl

    r91772 r94082  
    22# Copyright 2018-2020 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
    … …  
    6262#       2^51 radix;
    6363
    64 $flavour = shift;
    65 $output  = shift;
    66 if ($flavour =~ /\./) { $output = $flavour; undef $flavour; }
     64# $output is the last argument if it looks like a file (it has an extension)
     65# $flavour is the first argument if it doesn't look like a file
     66$output = $#ARGV >= 0 && $ARGV[$#ARGV] =~ m|\.\w+$| ? pop : undef;
     67$flavour = $#ARGV >= 0 && $ARGV[0] !~ m|\.| ? shift : undef;
    6768
    6869$win64=0; $win64=1 if ($flavour =~ /[nm]asm|mingw64/ || $output =~ /\.asm$/);
    … …  
    7374die "can't locate x86_64-xlate.pl";
    7475
    75 open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";
     76open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\""
     77    or die "can't call $xlate: $!";
    7678*STDOUT=*OUT;
    7779
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