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:
13 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/camellia/asm/cmll-x86.pl

    r91772 r94082  
    22# Copyright 2008-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
    … …  
    5050$OPENSSL=1;
    5151
    52 $output = pop;
    53 open STDOUT,">$output";
     52$output = pop and open STDOUT,">$output";
    5453
    5554&asm_init($ARGV[0],$ARGV[$#ARGV] eq "386");

  • trunk/src/libs/openssl-3.0.1/crypto/camellia/asm/cmll-x86_64.pl

    r91772 r94082  
    22# Copyright 2008-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
    … …  
    3737# apparently emulates some of 64-bit operations in [32-bit] microcode.
    3838
    39 $flavour = shift;
    40 $output  = shift;
    41 if ($flavour =~ /\./) { $output = $flavour; undef $flavour; }
     39# $output is the last argument if it looks like a file (it has an extension)
     40# $flavour is the first argument if it doesn't look like a file
     41$output = $#ARGV >= 0 && $ARGV[$#ARGV] =~ m|\.\w+$| ? pop : undef;
     42$flavour = $#ARGV >= 0 && $ARGV[0] !~ m|\.| ? shift : undef;
    4243
    4344$win64=0; $win64=1 if ($flavour =~ /[nm]asm|mingw64/ || $output =~ /\.asm$/);
    … …  
    4849die "can't locate x86_64-xlate.pl";
    4950
    50 open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";
     51open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\""
     52    or die "can't call $xlate: $!";
    5153*STDOUT=*OUT;
    5254
    … …  
    686688Camellia_cbc_encrypt:
    687689.cfi_startproc
     690        endbranch
    688691        cmp     \$0,%rdx
    689692        je      .Lcbc_abort

  • trunk/src/libs/openssl-3.0.1/crypto/camellia/asm/cmllt4-sparcv9.pl

    r91772 r94082  
    11#! /usr/bin/env perl
    2 # Copyright 2012-2020 The OpenSSL Project Authors. All Rights Reserved.
     2# Copyright 2012-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
    … …  
    5454require "sparcv9_modes.pl";
    5555
    56 $output = pop;
    57 open STDOUT,">$output";
     56$output = pop and open STDOUT,">$output";
    5857
    5958$::evp=1;       # if $evp is set to 0, script generates module with
    … …  
    6867
    6968$code=<<___;
    70 #include "sparc_arch.h"
     69#ifndef __ASSEMBLER__
     70# define __ASSEMBLER__ 1
     71#endif
     72#include "crypto/sparc_arch.h"
    7173
    7274.text

  • trunk/src/libs/openssl-3.0.1/crypto/camellia/build.info

    r91772 r94082  
    11LIBS=../../libcrypto
    2 SOURCE[../../libcrypto]=\
    3         cmll_ecb.c cmll_ofb.c cmll_cfb.c cmll_ctr.c \
    4         {- $target{cmll_asm_src} -}
    52
    6 GENERATE[cmll-x86.s]=asm/cmll-x86.pl \
    7         $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) \
    8         $(PROCESSOR)
     3$CMLLASM=camellia.c cmll_misc.c cmll_cbc.c
     4IF[{- !$disabled{asm} -}]
     5  $CMLLASM_x86=cmll-x86.s
     6  $CMLLASM_x86_64=cmll-x86_64.s cmll_misc.c
     7  $CMLLASM_sparcv9=camellia.c cmll_misc.c cmll_cbc.c cmllt4-sparcv9.S
     8
     9  # Now that we have defined all the arch specific variables, use the
     10  # appropriate one
     11  IF[$CMLLASM_{- $target{asm_arch} -}]
     12    $CMLLASM=$CMLLASM_{- $target{asm_arch} -}
     13    $CMLLDEF=CMLL_ASM
     14  ENDIF
     15ENDIF
     16
     17SOURCE[../../libcrypto]=cmll_ecb.c cmll_ofb.c cmll_cfb.c cmll_ctr.c $CMLLASM
     18DEFINE[../../libcrypto]=$CMLLDEF
     19
     20GENERATE[cmll-x86.s]=asm/cmll-x86.pl
    921DEPEND[cmll-x86.s]=../perlasm/x86asm.pl
    10 GENERATE[cmll-x86_64.s]=asm/cmll-x86_64.pl $(PERLASM_SCHEME)
    11 GENERATE[cmllt4-sparcv9.S]=asm/cmllt4-sparcv9.pl $(PERLASM_SCHEME)
     22GENERATE[cmll-x86_64.s]=asm/cmll-x86_64.pl
     23GENERATE[cmllt4-sparcv9.S]=asm/cmllt4-sparcv9.pl
    1224INCLUDE[cmllt4-sparcv9.o]=..
    1325DEPEND[cmllt4-sparcv9.S]=../perlasm/sparcv9_modes.pl

  • trunk/src/libs/openssl-3.0.1/crypto/camellia/camellia.c

    r91772 r94082  
    11/*
    2  * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 2006-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
    … …  
    3939 * words reasonable performance even with not so modern compilers.
    4040 */
     41
     42/*
     43 * Camellia low level APIs are deprecated for public use, but still ok for
     44 * internal use.
     45 */
     46#include "internal/deprecated.h"
    4147
    4248#include <openssl/camellia.h>

  • trunk/src/libs/openssl-3.0.1/crypto/camellia/cmll_cbc.c

    r91772 r94082  
    11/*
    2  * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 2006-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
    77 * https://www.openssl.org/source/license.html
    88 */
     9
     10/*
     11 * Camellia low level APIs are deprecated for public use, but still ok for
     12 * internal use.
     13 */
     14#include "internal/deprecated.h"
    915
    1016#include <openssl/camellia.h>

  • trunk/src/libs/openssl-3.0.1/crypto/camellia/cmll_cfb.c

    r91772 r94082  
    11/*
    2  * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 2006-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
    77 * https://www.openssl.org/source/license.html
    88 */
     9
     10/*
     11 * Camellia low level APIs are deprecated for public use, but still ok for
     12 * internal use.
     13 */
     14#include "internal/deprecated.h"
    915
    1016#include <openssl/camellia.h>

  • trunk/src/libs/openssl-3.0.1/crypto/camellia/cmll_ctr.c

    r91772 r94082  
    11/*
    2  * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 2006-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
    77 * https://www.openssl.org/source/license.html
    88 */
     9
     10/*
     11 * Camellia low level APIs are deprecated for public use, but still ok for
     12 * internal use.
     13 */
     14#include "internal/deprecated.h"
    915
    1016#include <openssl/camellia.h>

  • trunk/src/libs/openssl-3.0.1/crypto/camellia/cmll_ecb.c

    r91772 r94082  
    11/*
    2  * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 2006-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
    77 * https://www.openssl.org/source/license.html
    88 */
     9
     10/*
     11 * Camellia low level APIs are deprecated for public use, but still ok for
     12 * internal use.
     13 */
     14#include "internal/deprecated.h"
    915
    1016#include <openssl/camellia.h>

  • trunk/src/libs/openssl-3.0.1/crypto/camellia/cmll_local.h

    r91772 r94082  
    22 * Copyright 2006-2016 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

  • trunk/src/libs/openssl-3.0.1/crypto/camellia/cmll_misc.c

    r91772 r94082  
    11/*
    2  * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 2006-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
    77 * https://www.openssl.org/source/license.html
    88 */
     9
     10/*
     11 * Camellia low level APIs are deprecated for public use, but still ok for
     12 * internal use.
     13 */
     14#include "internal/deprecated.h"
    915
    1016#include <openssl/opensslv.h>

  • trunk/src/libs/openssl-3.0.1/crypto/camellia/cmll_ofb.c

    r91772 r94082  
    11/*
    2  * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 2006-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
    77 * https://www.openssl.org/source/license.html
    88 */
     9
     10/*
     11 * Camellia low level APIs are deprecated for public use, but still ok for
     12 * internal use.
     13 */
     14#include "internal/deprecated.h"
    915
    1016#include <openssl/camellia.h>
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