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:
2 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/include/openssl/idea.h

    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
    … …  
    88 */
    99
    10 #ifndef HEADER_IDEA_H
    11 # define HEADER_IDEA_H
     10#ifndef OPENSSL_IDEA_H
     11# define OPENSSL_IDEA_H
     12# pragma once
     13
     14# include <openssl/macros.h>
     15# ifndef OPENSSL_NO_DEPRECATED_3_0
     16#  define HEADER_IDEA_H
     17# endif
    1218
    1319# include <openssl/opensslconf.h>
    1420
    1521# ifndef OPENSSL_NO_IDEA
    16 # ifdef  __cplusplus
     22#  ifdef  __cplusplus
    1723extern "C" {
    18 # endif
     24#  endif
     25
     26#  define IDEA_BLOCK      8
     27#  define IDEA_KEY_LENGTH 16
     28
     29#  ifndef OPENSSL_NO_DEPRECATED_3_0
    1930
    2031typedef unsigned int IDEA_INT;
    2132
    22 # define IDEA_ENCRYPT    1
    23 # define IDEA_DECRYPT    0
    24 
    25 # define IDEA_BLOCK      8
    26 # define IDEA_KEY_LENGTH 16
     33#   define IDEA_ENCRYPT    1
     34#   define IDEA_DECRYPT    0
    2735
    2836typedef struct idea_key_st {
    2937    IDEA_INT data[9][6];
    3038} IDEA_KEY_SCHEDULE;
     39#endif
     40#ifndef OPENSSL_NO_DEPRECATED_3_0
     41OSSL_DEPRECATEDIN_3_0 const char *IDEA_options(void);
     42OSSL_DEPRECATEDIN_3_0 void IDEA_ecb_encrypt(const unsigned char *in,
     43                                            unsigned char *out,
     44                                            IDEA_KEY_SCHEDULE *ks);
     45OSSL_DEPRECATEDIN_3_0 void IDEA_set_encrypt_key(const unsigned char *key,
     46                                                IDEA_KEY_SCHEDULE *ks);
     47OSSL_DEPRECATEDIN_3_0 void IDEA_set_decrypt_key(IDEA_KEY_SCHEDULE *ek,
     48                                                IDEA_KEY_SCHEDULE *dk);
     49OSSL_DEPRECATEDIN_3_0 void IDEA_cbc_encrypt(const unsigned char *in,
     50                                            unsigned char *out, long length,
     51                                            IDEA_KEY_SCHEDULE *ks,
     52                                            unsigned char *iv, int enc);
     53OSSL_DEPRECATEDIN_3_0 void IDEA_cfb64_encrypt(const unsigned char *in,
     54                                              unsigned char *out, long length,
     55                                              IDEA_KEY_SCHEDULE *ks,
     56                                              unsigned char *iv, int *num,
     57                                              int enc);
     58OSSL_DEPRECATEDIN_3_0 void IDEA_ofb64_encrypt(const unsigned char *in,
     59                                              unsigned char *out, long length,
     60                                              IDEA_KEY_SCHEDULE *ks,
     61                                              unsigned char *iv, int *num);
     62OSSL_DEPRECATEDIN_3_0 void IDEA_encrypt(unsigned long *in,
     63                                        IDEA_KEY_SCHEDULE *ks);
     64#endif
    3165
    32 const char *IDEA_options(void);
    33 void IDEA_ecb_encrypt(const unsigned char *in, unsigned char *out,
    34                       IDEA_KEY_SCHEDULE *ks);
    35 void IDEA_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks);
    36 void IDEA_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk);
    37 void IDEA_cbc_encrypt(const unsigned char *in, unsigned char *out,
    38                       long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
    39                       int enc);
    40 void IDEA_cfb64_encrypt(const unsigned char *in, unsigned char *out,
    41                         long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
    42                         int *num, int enc);
    43 void IDEA_ofb64_encrypt(const unsigned char *in, unsigned char *out,
    44                         long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
    45                         int *num);
    46 void IDEA_encrypt(unsigned long *in, IDEA_KEY_SCHEDULE *ks);
     66#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
     67#   define idea_options          IDEA_options
     68#   define idea_ecb_encrypt      IDEA_ecb_encrypt
     69#   define idea_set_encrypt_key  IDEA_set_encrypt_key
     70#   define idea_set_decrypt_key  IDEA_set_decrypt_key
     71#   define idea_cbc_encrypt      IDEA_cbc_encrypt
     72#   define idea_cfb64_encrypt    IDEA_cfb64_encrypt
     73#   define idea_ofb64_encrypt    IDEA_ofb64_encrypt
     74#   define idea_encrypt          IDEA_encrypt
     75#  endif
    4776
    48 # if OPENSSL_API_COMPAT < 0x10100000L
    49 #  define idea_options          IDEA_options
    50 #  define idea_ecb_encrypt      IDEA_ecb_encrypt
    51 #  define idea_set_encrypt_key  IDEA_set_encrypt_key
    52 #  define idea_set_decrypt_key  IDEA_set_decrypt_key
    53 #  define idea_cbc_encrypt      IDEA_cbc_encrypt
    54 #  define idea_cfb64_encrypt    IDEA_cfb64_encrypt
    55 #  define idea_ofb64_encrypt    IDEA_ofb64_encrypt
    56 #  define idea_encrypt          IDEA_encrypt
    57 # endif
    58 
    59 # ifdef  __cplusplus
     77#  ifdef  __cplusplus
    6078}
    61 # endif
     79#  endif
    6280# endif
    6381
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