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/hmac.h

    r91772 r94082  
    11/*
    2  * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 1995-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
    … …  
    88 */
    99
    10 #ifndef HEADER_HMAC_H
    11 # define HEADER_HMAC_H
     10#ifndef OPENSSL_HMAC_H
     11# define OPENSSL_HMAC_H
     12# pragma once
     13
     14# include <openssl/macros.h>
     15# ifndef OPENSSL_NO_DEPRECATED_3_0
     16#  define HEADER_HMAC_H
     17# endif
    1218
    1319# include <openssl/opensslconf.h>
    … …  
    1521# include <openssl/evp.h>
    1622
    17 # if OPENSSL_API_COMPAT < 0x10200000L
    18 #  define HMAC_MAX_MD_CBLOCK      128    /* Deprecated */
     23# ifndef OPENSSL_NO_DEPRECATED_3_0
     24#  define HMAC_MAX_MD_CBLOCK      200    /* Deprecated */
    1925# endif
    2026
    21 #ifdef  __cplusplus
     27# ifdef  __cplusplus
    2228extern "C" {
    23 #endif
     29# endif
    2430
    25 size_t HMAC_size(const HMAC_CTX *e);
    26 HMAC_CTX *HMAC_CTX_new(void);
    27 int HMAC_CTX_reset(HMAC_CTX *ctx);
    28 void HMAC_CTX_free(HMAC_CTX *ctx);
     31# ifndef OPENSSL_NO_DEPRECATED_3_0
     32OSSL_DEPRECATEDIN_3_0 size_t HMAC_size(const HMAC_CTX *e);
     33OSSL_DEPRECATEDIN_3_0 HMAC_CTX *HMAC_CTX_new(void);
     34OSSL_DEPRECATEDIN_3_0 int HMAC_CTX_reset(HMAC_CTX *ctx);
     35OSSL_DEPRECATEDIN_3_0 void HMAC_CTX_free(HMAC_CTX *ctx);
     36# endif
     37# ifndef OPENSSL_NO_DEPRECATED_1_1_0
     38OSSL_DEPRECATEDIN_1_1_0 __owur int HMAC_Init(HMAC_CTX *ctx,
     39                                             const void *key, int len,
     40                                             const EVP_MD *md);
     41# endif
     42# ifndef OPENSSL_NO_DEPRECATED_3_0
     43OSSL_DEPRECATEDIN_3_0 int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
     44                                       const EVP_MD *md, ENGINE *impl);
     45OSSL_DEPRECATEDIN_3_0 int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data,
     46                                      size_t len);
     47OSSL_DEPRECATEDIN_3_0 int HMAC_Final(HMAC_CTX *ctx, unsigned char *md,
     48                                     unsigned int *len);
     49OSSL_DEPRECATEDIN_3_0 __owur int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
     50OSSL_DEPRECATEDIN_3_0 void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags);
     51OSSL_DEPRECATEDIN_3_0 const EVP_MD *HMAC_CTX_get_md(const HMAC_CTX *ctx);
     52# endif
    2953
    30 DEPRECATEDIN_1_1_0(__owur int HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
    31                      const EVP_MD *md))
     54unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
     55                    const unsigned char *data, size_t data_len,
     56                    unsigned char *md, unsigned int *md_len);
    3257
    33 /*__owur*/ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
    34                             const EVP_MD *md, ENGINE *impl);
    35 /*__owur*/ int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data,
    36                            size_t len);
    37 /*__owur*/ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md,
    38                           unsigned int *len);
    39 unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
    40                     const unsigned char *d, size_t n, unsigned char *md,
    41                     unsigned int *md_len);
    42 __owur int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
    43 
    44 void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags);
    45 const EVP_MD *HMAC_CTX_get_md(const HMAC_CTX *ctx);
    46 
    47 #ifdef  __cplusplus
     58# ifdef  __cplusplus
    4859}
    49 #endif
     60# endif
    5061
    5162#endif
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