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

    r91772 r94082  
    11/*
    2  * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 2006-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_TS_H
    11 # define HEADER_TS_H
     10#ifndef OPENSSL_TS_H
     11# define OPENSSL_TS_H
     12# pragma once
     13
     14# include <openssl/macros.h>
     15# ifndef OPENSSL_NO_DEPRECATED_3_0
     16#  define HEADER_TS_H
     17# endif
    1218
    1319# include <openssl/opensslconf.h>
    … …  
    2430# include <openssl/dh.h>
    2531# include <openssl/tserr.h>
     32# include <openssl/ess.h>
    2633# ifdef  __cplusplus
    2734extern "C" {
    … …  
    5663
    5764typedef struct TS_status_info_st TS_STATUS_INFO;
    58 typedef struct ESS_issuer_serial ESS_ISSUER_SERIAL;
    59 typedef struct ESS_cert_id ESS_CERT_ID;
    60 typedef struct ESS_signing_cert ESS_SIGNING_CERT;
    61 
    62 DEFINE_STACK_OF(ESS_CERT_ID)
    63 
    64 typedef struct ESS_cert_id_v2_st ESS_CERT_ID_V2;
    65 typedef struct ESS_signing_cert_v2_st ESS_SIGNING_CERT_V2;
    66 
    67 DEFINE_STACK_OF(ESS_CERT_ID_V2)
    6865
    6966typedef struct TS_resp_st TS_RESP;
    7067
    71 TS_REQ *TS_REQ_new(void);
    72 void TS_REQ_free(TS_REQ *a);
    73 int i2d_TS_REQ(const TS_REQ *a, unsigned char **pp);
    74 TS_REQ *d2i_TS_REQ(TS_REQ **a, const unsigned char **pp, long length);
    75 
    76 TS_REQ *TS_REQ_dup(TS_REQ *a);
     68DECLARE_ASN1_ALLOC_FUNCTIONS(TS_REQ)
     69DECLARE_ASN1_ENCODE_FUNCTIONS_only(TS_REQ, TS_REQ)
     70DECLARE_ASN1_DUP_FUNCTION(TS_REQ)
    7771
    7872#ifndef OPENSSL_NO_STDIO
    7973TS_REQ *d2i_TS_REQ_fp(FILE *fp, TS_REQ **a);
    80 int i2d_TS_REQ_fp(FILE *fp, TS_REQ *a);
     74int i2d_TS_REQ_fp(FILE *fp, const TS_REQ *a);
    8175#endif
    8276TS_REQ *d2i_TS_REQ_bio(BIO *fp, TS_REQ **a);
    83 int i2d_TS_REQ_bio(BIO *fp, TS_REQ *a);
    84 
    85 TS_MSG_IMPRINT *TS_MSG_IMPRINT_new(void);
    86 void TS_MSG_IMPRINT_free(TS_MSG_IMPRINT *a);
    87 int i2d_TS_MSG_IMPRINT(const TS_MSG_IMPRINT *a, unsigned char **pp);
    88 TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT(TS_MSG_IMPRINT **a,
    89                                    const unsigned char **pp, long length);
    90 
    91 TS_MSG_IMPRINT *TS_MSG_IMPRINT_dup(TS_MSG_IMPRINT *a);
     77int i2d_TS_REQ_bio(BIO *fp, const TS_REQ *a);
     78
     79DECLARE_ASN1_ALLOC_FUNCTIONS(TS_MSG_IMPRINT)
     80DECLARE_ASN1_ENCODE_FUNCTIONS_only(TS_MSG_IMPRINT, TS_MSG_IMPRINT)
     81DECLARE_ASN1_DUP_FUNCTION(TS_MSG_IMPRINT)
    9282
    9383#ifndef OPENSSL_NO_STDIO
    9484TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT **a);
    95 int i2d_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT *a);
     85int i2d_TS_MSG_IMPRINT_fp(FILE *fp, const TS_MSG_IMPRINT *a);
    9686#endif
    9787TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_bio(BIO *bio, TS_MSG_IMPRINT **a);
    98 int i2d_TS_MSG_IMPRINT_bio(BIO *bio, TS_MSG_IMPRINT *a);
    99 
    100 TS_RESP *TS_RESP_new(void);
    101 void TS_RESP_free(TS_RESP *a);
    102 int i2d_TS_RESP(const TS_RESP *a, unsigned char **pp);
    103 TS_RESP *d2i_TS_RESP(TS_RESP **a, const unsigned char **pp, long length);
    104 TS_TST_INFO *PKCS7_to_TS_TST_INFO(PKCS7 *token);
    105 TS_RESP *TS_RESP_dup(TS_RESP *a);
     88int i2d_TS_MSG_IMPRINT_bio(BIO *bio, const TS_MSG_IMPRINT *a);
     89
     90DECLARE_ASN1_ALLOC_FUNCTIONS(TS_RESP)
     91DECLARE_ASN1_ENCODE_FUNCTIONS_only(TS_RESP, TS_RESP)
     92DECLARE_ASN1_DUP_FUNCTION(TS_RESP)
    10693
    10794#ifndef OPENSSL_NO_STDIO
    10895TS_RESP *d2i_TS_RESP_fp(FILE *fp, TS_RESP **a);
    109 int i2d_TS_RESP_fp(FILE *fp, TS_RESP *a);
     96int i2d_TS_RESP_fp(FILE *fp, const TS_RESP *a);
    11097#endif
    11198TS_RESP *d2i_TS_RESP_bio(BIO *bio, TS_RESP **a);
    112 int i2d_TS_RESP_bio(BIO *bio, TS_RESP *a);
    113 
    114 TS_STATUS_INFO *TS_STATUS_INFO_new(void);
    115 void TS_STATUS_INFO_free(TS_STATUS_INFO *a);
    116 int i2d_TS_STATUS_INFO(const TS_STATUS_INFO *a, unsigned char **pp);
    117 TS_STATUS_INFO *d2i_TS_STATUS_INFO(TS_STATUS_INFO **a,
    118                                    const unsigned char **pp, long length);
    119 TS_STATUS_INFO *TS_STATUS_INFO_dup(TS_STATUS_INFO *a);
    120 
    121 TS_TST_INFO *TS_TST_INFO_new(void);
    122 void TS_TST_INFO_free(TS_TST_INFO *a);
    123 int i2d_TS_TST_INFO(const TS_TST_INFO *a, unsigned char **pp);
    124 TS_TST_INFO *d2i_TS_TST_INFO(TS_TST_INFO **a, const unsigned char **pp,
    125                              long length);
    126 TS_TST_INFO *TS_TST_INFO_dup(TS_TST_INFO *a);
     99int i2d_TS_RESP_bio(BIO *bio, const TS_RESP *a);
     100
     101DECLARE_ASN1_ALLOC_FUNCTIONS(TS_STATUS_INFO)
     102DECLARE_ASN1_ENCODE_FUNCTIONS_only(TS_STATUS_INFO, TS_STATUS_INFO)
     103DECLARE_ASN1_DUP_FUNCTION(TS_STATUS_INFO)
     104
     105DECLARE_ASN1_ALLOC_FUNCTIONS(TS_TST_INFO)
     106DECLARE_ASN1_ENCODE_FUNCTIONS_only(TS_TST_INFO, TS_TST_INFO)
     107DECLARE_ASN1_DUP_FUNCTION(TS_TST_INFO)
     108TS_TST_INFO *PKCS7_to_TS_TST_INFO(PKCS7 *token);
    127109
    128110#ifndef OPENSSL_NO_STDIO
    129111TS_TST_INFO *d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a);
    130 int i2d_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO *a);
     112int i2d_TS_TST_INFO_fp(FILE *fp, const TS_TST_INFO *a);
    131113#endif
    132114TS_TST_INFO *d2i_TS_TST_INFO_bio(BIO *bio, TS_TST_INFO **a);
    133 int i2d_TS_TST_INFO_bio(BIO *bio, TS_TST_INFO *a);
    134 
    135 TS_ACCURACY *TS_ACCURACY_new(void);
    136 void TS_ACCURACY_free(TS_ACCURACY *a);
    137 int i2d_TS_ACCURACY(const TS_ACCURACY *a, unsigned char **pp);
    138 TS_ACCURACY *d2i_TS_ACCURACY(TS_ACCURACY **a, const unsigned char **pp,
    139                              long length);
    140 TS_ACCURACY *TS_ACCURACY_dup(TS_ACCURACY *a);
    141 
    142 ESS_ISSUER_SERIAL *ESS_ISSUER_SERIAL_new(void);
    143 void ESS_ISSUER_SERIAL_free(ESS_ISSUER_SERIAL *a);
    144 int i2d_ESS_ISSUER_SERIAL(const ESS_ISSUER_SERIAL *a, unsigned char **pp);
    145 ESS_ISSUER_SERIAL *d2i_ESS_ISSUER_SERIAL(ESS_ISSUER_SERIAL **a,
    146                                          const unsigned char **pp,
    147                                          long length);
    148 ESS_ISSUER_SERIAL *ESS_ISSUER_SERIAL_dup(ESS_ISSUER_SERIAL *a);
    149 
    150 ESS_CERT_ID *ESS_CERT_ID_new(void);
    151 void ESS_CERT_ID_free(ESS_CERT_ID *a);
    152 int i2d_ESS_CERT_ID(const ESS_CERT_ID *a, unsigned char **pp);
    153 ESS_CERT_ID *d2i_ESS_CERT_ID(ESS_CERT_ID **a, const unsigned char **pp,
    154                              long length);
    155 ESS_CERT_ID *ESS_CERT_ID_dup(ESS_CERT_ID *a);
    156 
    157 ESS_SIGNING_CERT *ESS_SIGNING_CERT_new(void);
    158 void ESS_SIGNING_CERT_free(ESS_SIGNING_CERT *a);
    159 int i2d_ESS_SIGNING_CERT(const ESS_SIGNING_CERT *a, unsigned char **pp);
    160 ESS_SIGNING_CERT *d2i_ESS_SIGNING_CERT(ESS_SIGNING_CERT **a,
    161                                        const unsigned char **pp, long length);
    162 ESS_SIGNING_CERT *ESS_SIGNING_CERT_dup(ESS_SIGNING_CERT *a);
    163 
    164 ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new(void);
    165 void ESS_CERT_ID_V2_free(ESS_CERT_ID_V2 *a);
    166 int i2d_ESS_CERT_ID_V2(const ESS_CERT_ID_V2 *a, unsigned char **pp);
    167 ESS_CERT_ID_V2 *d2i_ESS_CERT_ID_V2(ESS_CERT_ID_V2 **a,
    168                                    const unsigned char **pp, long length);
    169 ESS_CERT_ID_V2 *ESS_CERT_ID_V2_dup(ESS_CERT_ID_V2 *a);
    170 
    171 ESS_SIGNING_CERT_V2 *ESS_SIGNING_CERT_V2_new(void);
    172 void ESS_SIGNING_CERT_V2_free(ESS_SIGNING_CERT_V2 *a);
    173 int i2d_ESS_SIGNING_CERT_V2(const ESS_SIGNING_CERT_V2 *a, unsigned char **pp);
    174 ESS_SIGNING_CERT_V2 *d2i_ESS_SIGNING_CERT_V2(ESS_SIGNING_CERT_V2 **a,
    175                                              const unsigned char **pp,
    176                                              long length);
    177 ESS_SIGNING_CERT_V2 *ESS_SIGNING_CERT_V2_dup(ESS_SIGNING_CERT_V2 *a);
     115int i2d_TS_TST_INFO_bio(BIO *bio, const TS_TST_INFO *a);
     116
     117DECLARE_ASN1_ALLOC_FUNCTIONS(TS_ACCURACY)
     118DECLARE_ASN1_ENCODE_FUNCTIONS_only(TS_ACCURACY, TS_ACCURACY)
     119DECLARE_ASN1_DUP_FUNCTION(TS_ACCURACY)
    178120
    179121int TS_REQ_set_version(TS_REQ *a, long version);
    … …  
    323265typedef struct TS_resp_ctx TS_RESP_CTX;
    324266
    325 DEFINE_STACK_OF_CONST(EVP_MD)
    326 
    327267/* Creates a response context that can be used for generating responses. */
    328268TS_RESP_CTX *TS_RESP_CTX_new(void);
     269TS_RESP_CTX *TS_RESP_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq);
    329270void TS_RESP_CTX_free(TS_RESP_CTX *ctx);
    330271
    … …  
    480421                                         unsigned char *hexstr, long len);
    481422X509_STORE *TS_VERIFY_CTX_set_store(TS_VERIFY_CTX *ctx, X509_STORE *s);
    482 STACK_OF(X509) *TS_VERIFY_CTS_set_certs(TS_VERIFY_CTX *ctx, STACK_OF(X509) *certs);
     423# ifndef OPENSSL_NO_DEPRECATED_3_0
     424#  define TS_VERIFY_CTS_set_certs(ctx, cert) TS_VERIFY_CTX_set_certs(ctx,cert)
     425# endif
     426STACK_OF(X509) *TS_VERIFY_CTX_set_certs(TS_VERIFY_CTX *ctx, STACK_OF(X509) *certs);
    483427
    484428/*-
    … …  
    544488int TS_CONF_set_digests(CONF *conf, const char *section, TS_RESP_CTX *ctx);
    545489int TS_CONF_set_accuracy(CONF *conf, const char *section, TS_RESP_CTX *ctx);
    546 int TS_CONF_set_clock_precision_digits(CONF *conf, const char *section,
     490int TS_CONF_set_clock_precision_digits(const CONF *conf, const char *section,
    547491                                       TS_RESP_CTX *ctx);
    548492int TS_CONF_set_ordering(CONF *conf, const char *section, TS_RESP_CTX *ctx);
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