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:
10 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/bf/asm/bf-586.pl

    r91772 r94082  
    22# Copyright 1995-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
    … …  
    1313require "cbc.pl";
    1414
    15 $output = pop;
    16 open STDOUT,">$output";
     15$output = pop and open STDOUT,">$output";
    1716
    1817&asm_init($ARGV[0],$ARGV[$#ARGV] eq "386");

  • trunk/src/libs/openssl-3.0.1/crypto/bf/bf_cfb64.c

    r91772 r94082  
    11/*
    2  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 1995-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 * BF low level APIs are deprecated for public use, but still ok for internal
     12 * use.
     13 */
     14#include "internal/deprecated.h"
    915
    1016#include <openssl/blowfish.h>

  • trunk/src/libs/openssl-3.0.1/crypto/bf/bf_ecb.c

    r91772 r94082  
    11/*
    2  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 1995-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 * BF low level APIs are deprecated for public use, but still ok for internal
     12 * use.
     13 */
     14#include "internal/deprecated.h"
    915
    1016#include <openssl/blowfish.h>

  • trunk/src/libs/openssl-3.0.1/crypto/bf/bf_enc.c

    r91772 r94082  
    11/*
    2  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 1995-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 * BF low level APIs are deprecated for public use, but still ok for internal
     12 * use.
     13 */
     14#include "internal/deprecated.h"
    915
    1016#include <openssl/blowfish.h>

  • trunk/src/libs/openssl-3.0.1/crypto/bf/bf_local.h

    r91772 r94082  
    22 * Copyright 1995-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/bf/bf_ofb64.c

    r91772 r94082  
    11/*
    2  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 1995-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 * BF low level APIs are deprecated for public use, but still ok for internal
     12 * use.
     13 */
     14#include "internal/deprecated.h"
    915
    1016#include <openssl/blowfish.h>

  • trunk/src/libs/openssl-3.0.1/crypto/bf/bf_pi.h

    r91772 r94082  
    22 * Copyright 1995-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/bf/bf_skey.c

    r91772 r94082  
    11/*
    2  * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 1995-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 * BF low level APIs are deprecated for public use, but still ok for internal
     12 * use.
     13 */
     14#include "internal/deprecated.h"
    915
    1016#include <stdio.h>

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

    r91772 r94082  
    11LIBS=../../libcrypto
    2 SOURCE[../../libcrypto]=bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c \
    3         {- $target{bf_asm_src} -}
    42
    5 GENERATE[bf-586.s]=asm/bf-586.pl \
    6         $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR)
     3$BFASM=bf_enc.c
     4IF[{- !$disabled{asm} -}]
     5  $BFASM_x86=bf-586.s
     6
     7  # Now that we have defined all the arch specific variables, use the
     8  # appropriate one
     9  IF[$BFASM_{- $target{asm_arch} -}]
     10    $BFASM=$BFASM_{- $target{asm_arch} -}
     11  ENDIF
     12ENDIF
     13
     14$ALL=bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c $BFASM
     15
     16SOURCE[../../libcrypto]=$ALL
     17
     18# When all deprecated symbols are removed, libcrypto doesn't export the
     19# blowfish functions, so we must include them directly in liblegacy.a
     20IF[{- $disabled{'deprecated-3.0'} -}]
     21  SOURCE[../../providers/liblegacy.a]=$ALL
     22ENDIF
     23
     24GENERATE[bf-586.s]=asm/bf-586.pl
    725DEPEND[bf-586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl
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