VirtualBox

Ignore:
Timestamp:
Apr 11, 2023 10:16:56 AM (2 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
156787
Message:

openssl-3.1.0: After generating headers and asm (kmk recreate-headers recreate-headers)

Location:
trunk/src/libs/openssl-3.1.0/gen-includes/openssl
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/libs/openssl-3.1.0/gen-includes/openssl/asn1.h

    r94320 r99371  
    33 * Generated by Makefile from asn1.h.in
    44 *
    5  * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
     5 * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
    66 *
    77 * Licensed under the Apache License 2.0 (the "License").  You may not use
    … …  
    2222# endif
    2323
     24# ifndef OPENSSL_NO_STDIO
     25#  include <stdio.h>
     26# endif
    2427# include <time.h>
    2528# include <openssl/e_os2.h>

  • trunk/src/libs/openssl-3.1.0/gen-includes/openssl/cmp.h

    r94320 r99371  
    33 * Generated by Makefile from cmp.h.in
    44 *
    5  * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
     5 * Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved.
    66 * Copyright Nokia 2007-2019
    77 * Copyright Siemens AG 2015-2019
    … …  
    194194 *   }
    195195 */
    196 #  define OSSL_CMP_PKISTATUS_accepted 0
    197 #  define OSSL_CMP_PKISTATUS_grantedWithMods 1
    198 #  define OSSL_CMP_PKISTATUS_rejection 2
    199 #  define OSSL_CMP_PKISTATUS_waiting 3
    200 #  define OSSL_CMP_PKISTATUS_revocationWarning 4
     196#  define OSSL_CMP_PKISTATUS_request                -3
     197#  define OSSL_CMP_PKISTATUS_trans                  -2
     198#  define OSSL_CMP_PKISTATUS_unspecified            -1
     199#  define OSSL_CMP_PKISTATUS_accepted               0
     200#  define OSSL_CMP_PKISTATUS_grantedWithMods        1
     201#  define OSSL_CMP_PKISTATUS_rejection              2
     202#  define OSSL_CMP_PKISTATUS_waiting                3
     203#  define OSSL_CMP_PKISTATUS_revocationWarning      4
    201204#  define OSSL_CMP_PKISTATUS_revocationNotification 5
    202 #  define OSSL_CMP_PKISTATUS_keyUpdateWarning 6
     205#  define OSSL_CMP_PKISTATUS_keyUpdateWarning       6
    203206
    204207typedef ASN1_INTEGER OSSL_CMP_PKISTATUS;
    … …  
    445448int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
    446449int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
     450int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
    447451int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
    448452                                    STACK_OF(X509) *extraCertsOut);

  • trunk/src/libs/openssl-3.1.0/gen-includes/openssl/conf.h

    r94320 r99371  
    33 * Generated by Makefile from conf.h.in
    44 *
    5  * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
     5 * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
    66 *
    77 * Licensed under the Apache License 2.0 (the "License").  You may not use
    … …  
    2828# include <openssl/types.h>
    2929# include <openssl/conferr.h>
     30# ifndef OPENSSL_NO_STDIO
     31#  include <stdio.h>
     32# endif
    3033
    3134#ifdef  __cplusplus

  • trunk/src/libs/openssl-3.1.0/gen-includes/openssl/crypto.h

    r95219 r99371  
    342342                              CRYPTO_free_fn *free_fn);
    343343
    344 void *CRYPTO_malloc(size_t num, const char *file, int line);
    345 void *CRYPTO_zalloc(size_t num, const char *file, int line);
    346 void *CRYPTO_memdup(const void *str, size_t siz, const char *file, int line);
    347 char *CRYPTO_strdup(const char *str, const char *file, int line);
    348 char *CRYPTO_strndup(const char *str, size_t s, const char *file, int line);
     344OSSL_CRYPTO_ALLOC void *CRYPTO_malloc(size_t num, const char *file, int line);
     345OSSL_CRYPTO_ALLOC void *CRYPTO_zalloc(size_t num, const char *file, int line);
     346OSSL_CRYPTO_ALLOC void *CRYPTO_memdup(const void *str, size_t siz, const char *file, int line);
     347OSSL_CRYPTO_ALLOC char *CRYPTO_strdup(const char *str, const char *file, int line);
     348OSSL_CRYPTO_ALLOC char *CRYPTO_strndup(const char *str, size_t s, const char *file, int line);
    349349void CRYPTO_free(void *ptr, const char *file, int line);
    350350void CRYPTO_clear_free(void *ptr, size_t num, const char *file, int line);
    … …  
    355355int CRYPTO_secure_malloc_init(size_t sz, size_t minsize);
    356356int CRYPTO_secure_malloc_done(void);
    357 void *CRYPTO_secure_malloc(size_t num, const char *file, int line);
    358 void *CRYPTO_secure_zalloc(size_t num, const char *file, int line);
     357OSSL_CRYPTO_ALLOC void *CRYPTO_secure_malloc(size_t num, const char *file, int line);
     358OSSL_CRYPTO_ALLOC void *CRYPTO_secure_zalloc(size_t num, const char *file, int line);
    359359void CRYPTO_secure_free(void *ptr, const char *file, int line);
    360360void CRYPTO_secure_clear_free(void *ptr, size_t num,

  • trunk/src/libs/openssl-3.1.0/gen-includes/openssl/lhash.h

    r94320 r99371  
    11/*
    2  * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
    33 *
    44 * Licensed under the Apache License 2.0 (the "License").  You may not use
    … …  
    2525# include <openssl/e_os2.h>
    2626# include <openssl/bio.h>
     27# ifndef OPENSSL_NO_STDIO
     28#  include <stdio.h>
     29# endif
    2730
    2831#ifdef  __cplusplus
    … …  
    9396
    9497# ifndef OPENSSL_NO_STDIO
    95 void OPENSSL_LH_stats(const OPENSSL_LHASH *lh, FILE *fp);
    96 void OPENSSL_LH_node_stats(const OPENSSL_LHASH *lh, FILE *fp);
    97 void OPENSSL_LH_node_usage_stats(const OPENSSL_LHASH *lh, FILE *fp);
    98 # endif
    99 void OPENSSL_LH_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
    100 void OPENSSL_LH_node_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
    101 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
     98#  ifndef OPENSSL_NO_DEPRECATED_3_1
     99OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_stats(const OPENSSL_LHASH *lh, FILE *fp);
     100OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_stats(const OPENSSL_LHASH *lh, FILE *fp);
     101OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats(const OPENSSL_LHASH *lh, FILE *fp);
     102#  endif
     103# endif
     104# ifndef OPENSSL_NO_DEPRECATED_3_1
     105OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
     106OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
     107OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
     108# endif
    102109
    103110# ifndef OPENSSL_NO_DEPRECATED_1_1_0
    … …  
    130137/* Helper macro for internal use */
    131138# define DEFINE_LHASH_OF_INTERNAL(type) \
    132     LHASH_OF(type) { union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; }; \
     139    LHASH_OF(type) { \
     140        union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
     141    }; \
    133142    typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
    134143    typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
    135144    typedef void (*lh_##type##_doallfunc)(type *a); \
    136     static ossl_unused ossl_inline type *ossl_check_##type##_lh_plain_type(type *ptr) \
     145    static ossl_unused ossl_inline type *\
     146    ossl_check_##type##_lh_plain_type(type *ptr) \
    137147    { \
    138148        return ptr; \
    139149    } \
    140     static ossl_unused ossl_inline const type *ossl_check_const_##type##_lh_plain_type(const type *ptr) \
     150    static ossl_unused ossl_inline const type * \
     151    ossl_check_const_##type##_lh_plain_type(const type *ptr) \
    141152    { \
    142153        return ptr; \
    143154    } \
    144     static ossl_unused ossl_inline const OPENSSL_LHASH *ossl_check_const_##type##_lh_type(const LHASH_OF(type) *lh) \
     155    static ossl_unused ossl_inline const OPENSSL_LHASH * \
     156    ossl_check_const_##type##_lh_type(const LHASH_OF(type) *lh) \
    145157    { \
    146158        return (const OPENSSL_LHASH *)lh; \
    147159    } \
    148     static ossl_unused ossl_inline OPENSSL_LHASH *ossl_check_##type##_lh_type(LHASH_OF(type) *lh) \
     160    static ossl_unused ossl_inline OPENSSL_LHASH * \
     161    ossl_check_##type##_lh_type(LHASH_OF(type) *lh) \
    149162    { \
    150163        return (OPENSSL_LHASH *)lh; \
    151164    } \
    152     static ossl_unused ossl_inline OPENSSL_LH_COMPFUNC ossl_check_##type##_lh_compfunc_type(lh_##type##_compfunc cmp) \
     165    static ossl_unused ossl_inline OPENSSL_LH_COMPFUNC \
     166    ossl_check_##type##_lh_compfunc_type(lh_##type##_compfunc cmp) \
    153167    { \
    154168        return (OPENSSL_LH_COMPFUNC)cmp; \
    155169    } \
    156     static ossl_unused ossl_inline OPENSSL_LH_HASHFUNC ossl_check_##type##_lh_hashfunc_type(lh_##type##_hashfunc hfn) \
     170    static ossl_unused ossl_inline OPENSSL_LH_HASHFUNC \
     171    ossl_check_##type##_lh_hashfunc_type(lh_##type##_hashfunc hfn) \
    157172    { \
    158173        return (OPENSSL_LH_HASHFUNC)hfn; \
    159174    } \
    160     static ossl_unused ossl_inline OPENSSL_LH_DOALL_FUNC ossl_check_##type##_lh_doallfunc_type(lh_##type##_doallfunc dfn) \
     175    static ossl_unused ossl_inline OPENSSL_LH_DOALL_FUNC \
     176    ossl_check_##type##_lh_doallfunc_type(lh_##type##_doallfunc dfn) \
    161177    { \
    162178        return (OPENSSL_LH_DOALL_FUNC)dfn; \
    … …  
    164180    LHASH_OF(type)
    165181
    166 # define DEFINE_LHASH_OF(type) \
    167     LHASH_OF(type) { union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; }; \
    168     static ossl_unused ossl_inline LHASH_OF(type) *lh_##type##_new(unsigned long (*hfn)(const type *), \
    169                                                                    int (*cfn)(const type *, const type *)) \
     182# ifndef OPENSSL_NO_DEPRECATED_3_1
     183#  define DEFINE_LHASH_OF_DEPRECATED(type) \
     184    static ossl_unused ossl_inline void \
     185    lh_##type##_node_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
     186    { \
     187        OPENSSL_LH_node_stats_bio((const OPENSSL_LHASH *)lh, out); \
     188    } \
     189    static ossl_unused ossl_inline void \
     190    lh_##type##_node_usage_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
     191    { \
     192        OPENSSL_LH_node_usage_stats_bio((const OPENSSL_LHASH *)lh, out); \
     193    } \
     194    static ossl_unused ossl_inline void \
     195    lh_##type##_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
     196    { \
     197        OPENSSL_LH_stats_bio((const OPENSSL_LHASH *)lh, out); \
     198    }
     199# else
     200#  define DEFINE_LHASH_OF_DEPRECATED(type)
     201# endif
     202
     203# define DEFINE_LHASH_OF_EX(type) \
     204    LHASH_OF(type) { \
     205        union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
     206    }; \
     207    static ossl_unused ossl_inline LHASH_OF(type) * \
     208    lh_##type##_new(unsigned long (*hfn)(const type *), \
     209                    int (*cfn)(const type *, const type *)) \
    170210    { \
    171211        return (LHASH_OF(type) *) \
    172212            OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
    173213    } \
    174     static ossl_unused ossl_inline void lh_##type##_free(LHASH_OF(type) *lh) \
     214    static ossl_unused ossl_inline void \
     215    lh_##type##_free(LHASH_OF(type) *lh) \
    175216    { \
    176217        OPENSSL_LH_free((OPENSSL_LHASH *)lh); \
    177218    } \
    178     static ossl_unused ossl_inline void lh_##type##_flush(LHASH_OF(type) *lh) \
     219    static ossl_unused ossl_inline void \
     220    lh_##type##_flush(LHASH_OF(type) *lh) \
    179221    { \
    180222        OPENSSL_LH_flush((OPENSSL_LHASH *)lh); \
    181223    } \
    182     static ossl_unused ossl_inline type *lh_##type##_insert(LHASH_OF(type) *lh, type *d) \
     224    static ossl_unused ossl_inline type * \
     225    lh_##type##_insert(LHASH_OF(type) *lh, type *d) \
    183226    { \
    184227        return (type *)OPENSSL_LH_insert((OPENSSL_LHASH *)lh, d); \
    185228    } \
    186     static ossl_unused ossl_inline type *lh_##type##_delete(LHASH_OF(type) *lh, const type *d) \
     229    static ossl_unused ossl_inline type * \
     230    lh_##type##_delete(LHASH_OF(type) *lh, const type *d) \
    187231    { \
    188232        return (type *)OPENSSL_LH_delete((OPENSSL_LHASH *)lh, d); \
    189233    } \
    190     static ossl_unused ossl_inline type *lh_##type##_retrieve(LHASH_OF(type) *lh, const type *d) \
     234    static ossl_unused ossl_inline type * \
     235    lh_##type##_retrieve(LHASH_OF(type) *lh, const type *d) \
    191236    { \
    192237        return (type *)OPENSSL_LH_retrieve((OPENSSL_LHASH *)lh, d); \
    193238    } \
    194     static ossl_unused ossl_inline int lh_##type##_error(LHASH_OF(type) *lh) \
     239    static ossl_unused ossl_inline int \
     240    lh_##type##_error(LHASH_OF(type) *lh) \
    195241    { \
    196242        return OPENSSL_LH_error((OPENSSL_LHASH *)lh); \
    197243    } \
    198     static ossl_unused ossl_inline unsigned long lh_##type##_num_items(LHASH_OF(type) *lh) \
     244    static ossl_unused ossl_inline unsigned long \
     245    lh_##type##_num_items(LHASH_OF(type) *lh) \
    199246    { \
    200247        return OPENSSL_LH_num_items((OPENSSL_LHASH *)lh); \
    201248    } \
    202     static ossl_unused ossl_inline void lh_##type##_node_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
    203     { \
    204         OPENSSL_LH_node_stats_bio((const OPENSSL_LHASH *)lh, out); \
    205     } \
    206     static ossl_unused ossl_inline void lh_##type##_node_usage_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
    207     { \
    208         OPENSSL_LH_node_usage_stats_bio((const OPENSSL_LHASH *)lh, out); \
    209     } \
    210     static ossl_unused ossl_inline void lh_##type##_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
    211     { \
    212         OPENSSL_LH_stats_bio((const OPENSSL_LHASH *)lh, out); \
    213     } \
    214     static ossl_unused ossl_inline unsigned long lh_##type##_get_down_load(LHASH_OF(type) *lh) \
     249    static ossl_unused ossl_inline unsigned long \
     250    lh_##type##_get_down_load(LHASH_OF(type) *lh) \
    215251    { \
    216252        return OPENSSL_LH_get_down_load((OPENSSL_LHASH *)lh); \
    217253    } \
    218     static ossl_unused ossl_inline void lh_##type##_set_down_load(LHASH_OF(type) *lh, unsigned long dl) \
     254    static ossl_unused ossl_inline void \
     255    lh_##type##_set_down_load(LHASH_OF(type) *lh, unsigned long dl) \
    219256    { \
    220257        OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
    221258    } \
    222     static ossl_unused ossl_inline void lh_##type##_doall(LHASH_OF(type) *lh, \
    223                                                           void (*doall)(type *)) \
     259    static ossl_unused ossl_inline void \
     260    lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
    224261    { \
    225262        OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
    226263    } \
    227     static ossl_unused ossl_inline void lh_##type##_doall_arg(LHASH_OF(type) *lh, \
    228                                                               void (*doallarg)(type *, void *), \
    229                                                               void *arg) \
     264    static ossl_unused ossl_inline void \
     265    lh_##type##_doall_arg(LHASH_OF(type) *lh, \
     266                          void (*doallarg)(type *, void *), void *arg) \
    230267    { \
    231268        OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
    232269                             (OPENSSL_LH_DOALL_FUNCARG)doallarg, arg); \
    233270    } \
     271    LHASH_OF(type)
     272
     273# define DEFINE_LHASH_OF(type) \
     274    DEFINE_LHASH_OF_EX(type); \
     275    DEFINE_LHASH_OF_DEPRECATED(type) \
    234276    LHASH_OF(type)
    235277
    … …  
    246288                                   argtype *arg) \
    247289    { \
    248         OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
     290        OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
     291                             (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
    249292    } \
    250293    LHASH_OF(type)

  • trunk/src/libs/openssl-3.1.0/gen-includes/openssl/pkcs12.h

    r94320 r99371  
    33 * Generated by Makefile from pkcs12.h.in
    44 *
    5  * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
     5 * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
    66 *
    77 * Licensed under the Apache License 2.0 (the "License").  You may not use
    … …  
    2626# include <openssl/x509.h>
    2727# include <openssl/pkcs12err.h>
     28# ifndef OPENSSL_NO_STDIO
     29#  include <stdio.h>
     30# endif
    2831
    2932#ifdef __cplusplus

  • trunk/src/libs/openssl-3.1.0/gen-includes/openssl/pkcs7.h

    r94320 r99371  
    33 * Generated by Makefile from pkcs7.h.in
    44 *
    5  * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
     5 * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
    66 *
    77 * Licensed under the Apache License 2.0 (the "License").  You may not use
    … …  
    2929# include <openssl/types.h>
    3030# include <openssl/pkcs7err.h>
     31# ifndef OPENSSL_NO_STDIO
     32#  include <stdio.h>
     33# endif
    3134
    3235#ifdef  __cplusplus

  • trunk/src/libs/openssl-3.1.0/gen-includes/openssl/ssl.h

    r95219 r99371  
    4343# include <openssl/sslerr.h>
    4444# include <openssl/prov_ssl.h>
     45# ifndef OPENSSL_NO_STDIO
     46#  include <stdio.h>
     47# endif
    4548
    4649#ifdef  __cplusplus

  • trunk/src/libs/openssl-3.1.0/gen-includes/openssl/x509.h

    r95219 r99371  
    4141# include <openssl/sha.h>
    4242# include <openssl/x509err.h>
     43# ifndef OPENSSL_NO_STDIO
     44#  include <stdio.h>
     45# endif
    4346
    4447#ifdef  __cplusplus

  • trunk/src/libs/openssl-3.1.0/gen-includes/openssl/x509v3.h

    r94320 r99371  
    33 * Generated by Makefile from x509v3.h.in
    44 *
    5  * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
     5 * Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved.
    66 *
    77 * Licensed under the Apache License 2.0 (the "License").  You may not use
    … …  
    2626# include <openssl/conf.h>
    2727# include <openssl/x509v3err.h>
     28# ifndef OPENSSL_NO_STDIO
     29#  include <stdio.h>
     30# endif
    2831
    2932#ifdef __cplusplus
    … …  
    178181        ASN1_IA5STRING *rfc822Name;
    179182        ASN1_IA5STRING *dNSName;
    180         ASN1_TYPE *x400Address;
     183        ASN1_STRING *x400Address;
    181184        X509_NAME *directoryName;
    182185        EDIPARTYNAME *ediPartyName;
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