VirtualBox

Ignore:
Timestamp:
Mar 31, 2022 9:00:36 AM (3 years ago)
Author:
vboxsync
Message:

libs/openssl: Update to 3.0.2 and switch to it, bugref:10128

Location:
trunk/src/libs/openssl-3.0.2
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/libs/openssl-3.0.2

    • Property svn:mergeinfo

      •  

        old new  
        1313/vendor/openssl/1.1.1k:145841-145843
        1414/vendor/openssl/3.0.1:150323-150324
        15 /vendor/openssl/current:147554-150322
         15/vendor/openssl/3.0.2:150728-150729
         16/vendor/openssl/current:147554-150727

  • trunk/src/libs/openssl-3.0.2/demos/README.txt

    r94320 r94404  
    1111aesgcm.c               Demonstration of symmetric cipher GCM mode encrypt/decrypt
    1212aesccm.c               Demonstration of symmetric cipher CCM mode encrypt/decrypt
     13ariacbc.c              Demonstration of symmetric cipher CBC mode encrypt/decrypt
    1314
    1415cms:
    … …  
    1718EVP_MD_demo.c          Compute a digest from multiple buffers
    1819EVP_MD_stdin.c         Compute a digest with data read from stdin
     20EVP_MD_xof.c           Compute a digest using the SHAKE256 XOF
    1921EVP_f_md.c             Compute a digest using BIO and EVP_f_md
    2022
    … …  
    2628mac:
    2729gmac.c                 Demonstration of GMAC message authentication
     30poly1305.c             Demonstration of Poly1305-AES message authentication
     31siphash.c              Demonstration of SIPHASH message authentication
    2832
    2933pkey:
    3034EVP_PKEY_EC_keygen.c   Generate an EC key.
     35EVP_PKEY_RSA_keygen.c  Generate an RSA key.
    3136
    3237smime:
    … …  
    3843signature:
    3944EVP_Signature_demo.c   Compute and verify a signature from multiple buffers
     45rsa_pss_direct.c       Compute and verify an RSA-PSS signature from a hash
     46rsa_pss_hash.c         Compute and verify an RSA-PSS signature over a buffer

  • trunk/src/libs/openssl-3.0.2/demos/cipher/Makefile

    r94320 r94404  
    1212LDFLAGS = $(OPENSSL_LIBS_LOCATION) -lssl -lcrypto
    1313
    14 all: aesccm aesgcm
     14all: aesccm aesgcm ariacbc
    1515
    1616aesccm: aesccm.o
    1717aesgcm: aesgcm.o
     18ariacbc: ariacbc.o
    1819
    19 aesccm aesgcm:
     20aesccm aesgcm ariacbc:
    2021        $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
    2122
    2223clean:
    23         $(RM) aesccm aesgcm *.o
     24        $(RM) aesccm aesgcm ariacbc *.o

  • trunk/src/libs/openssl-3.0.2/demos/cms/cms_ver.c

    r94082 r94404  
    2828
    2929    st = X509_STORE_new();
     30    if (st == NULL)
     31        goto err;
    3032
    3133    /* Read in CA certificate */
    3234    tbio = BIO_new_file("cacert.pem", "r");
    3335
    34     if (!tbio)
     36    if (tbio == NULL)
    3537        goto err;
    3638
    3739    cacert = PEM_read_bio_X509(tbio, NULL, 0, NULL);
    3840
    39     if (!cacert)
     41    if (cacert == NULL)
    4042        goto err;
    4143
    … …  
    4749    in = BIO_new_file("smout.txt", "r");
    4850
    49     if (!in)
     51    if (in == NULL)
    5052        goto err;
    5153
    … …  
    5355    cms = SMIME_read_CMS(in, &cont);
    5456
    55     if (!cms)
     57    if (cms == NULL)
    5658        goto err;
    5759
    5860    /* File to output verified content to */
    5961    out = BIO_new_file("smver.txt", "w");
    60     if (!out)
     62    if (out == NULL)
    6163        goto err;
    6264
    … …  
    7779    }
    7880
     81    X509_STORE_free(st);
    7982    CMS_ContentInfo_free(cms);
    8083    X509_free(cacert);

  • trunk/src/libs/openssl-3.0.2/demos/digest/Makefile

    r94320 r94404  
    44#    LD_LIBRARY_PATH=../.. ./EVP_MD_demo
    55
    6 CFLAGS = -I../../include -g
     6CFLAGS = -I../../include -g -Wall
    77LDFLAGS = -L../..
    88LDLIBS = -lcrypto
    99
    10 all: EVP_MD_demo EVP_MD_stdin BIO_f_md
     10all: EVP_MD_demo EVP_MD_stdin EVP_MD_xof BIO_f_md
    1111
    1212%.o: %.c
    … …  
    1515EVP_MD_demo: EVP_MD_demo.o
    1616EVP_MD_stdin: EVP_MD_stdin.o
     17EVP_MD_xof: EVP_MD_xof.o
    1718BIO_f_md: BIO_f_md.o
    1819
    … …  
    2021
    2122clean:
    22         $(RM) *.o EVP_MD_demo EVP_MD_stdin BIO_f_md
     23        $(RM) *.o EVP_MD_demo EVP_MD_stdin EVP_MD_xof BIO_f_md

  • trunk/src/libs/openssl-3.0.2/demos/pkey/EVP_PKEY_EC_keygen.c

    r94320 r94404  
    11/*-
    2  * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
    33 *
    44 * Licensed under the Apache License 2.0 (the "License").  You may not use
    … …  
    9090    unsigned char out_privkey[80];
    9191    BIGNUM *out_priv = NULL;
    92     size_t i, out_pubkey_len, out_privkey_len = 0;
     92    size_t out_pubkey_len, out_privkey_len = 0;
    9393
    9494    if (!EVP_PKEY_get_utf8_string_param(pkey, OSSL_PKEY_PARAM_GROUP_NAME,

  • trunk/src/libs/openssl-3.0.2/demos/pkey/Makefile

    r94320 r94404  
    33#
    44#    LD_LIBRARY_PATH=../.. ./EVP_PKEY_EC_keygen
     5#    LD_LIBRARY_PATH=../.. ./EVP_PKEY_RSA_keygen
    56
    6 CFLAGS = -I../../include -g
     7CFLAGS = -I../../include -g -Wall
    78LDFLAGS = -L../..
    89LDLIBS = -lcrypto
    910
    10 all: EVP_PKEY_EC_keygen
     11all: EVP_PKEY_EC_keygen EVP_PKEY_RSA_keygen
    1112
    1213%.o: %.c
    … …  
    1516EVP_PKEY_EC_keygen: EVP_PKEY_EC_keygen.o
    1617
     18EVP_PKEY_RSA_keygen: EVP_PKEY_RSA_keygen.o
     19
    1720test: ;
    1821
    1922clean:
    20         $(RM) *.o EVP_PKEY_EC_keygen
     23        $(RM) *.o EVP_PKEY_EC_keygen EVP_PKEY_RSA_keygen

  • trunk/src/libs/openssl-3.0.2/demos/signature/Makefile

    r94320 r94404  
    44#    LD_LIBRARY_PATH=../.. ./EVP_Signature_demo
    55
    6 CFLAGS = -I../../include -g
     6CFLAGS = -I../../include -g -Wall
    77LDFLAGS = -L../..
    88LDLIBS = -lcrypto
    99
    10 all: EVP_Signature_demo
     10all: EVP_Signature_demo rsa_pss_direct rsa_pss_hash
    1111
    1212%.o: %.c
    … …  
    1414
    1515EVP_Signature_demo: EVP_Signature_demo.o
     16rsa_pss_direct: rsa_pss_direct.o
     17rsa_pss_hash: rsa_pss_hash.o
    1618
    1719test: ;
    1820
    1921clean:
    20         $(RM) *.o EVP_Signature_demo
     22        $(RM) *.o EVP_Signature_demo rsa_pss_direct rsa_pss_hash

  • trunk/src/libs/openssl-3.0.2/demos/smime/smver.c

    r94082 r94404  
    2828
    2929    st = X509_STORE_new();
     30    if (st == NULL)
     31        goto err;
    3032
    3133    /* Read in signer certificate and private key */
    3234    tbio = BIO_new_file("cacert.pem", "r");
    3335
    34     if (!tbio)
     36    if (tbio == NULL)
    3537        goto err;
    3638
    3739    cacert = PEM_read_bio_X509(tbio, NULL, 0, NULL);
    3840
    39     if (!cacert)
     41    if (cacert == NULL)
    4042        goto err;
    4143
    … …  
    4749    in = BIO_new_file("smout.txt", "r");
    4850
    49     if (!in)
     51    if (in == NULL)
    5052        goto err;
    5153
    … …  
    5355    p7 = SMIME_read_PKCS7(in, &cont);
    5456
    55     if (!p7)
     57    if (p7 == NULL)
    5658        goto err;
    5759
    5860    /* File to output verified content to */
    5961    out = BIO_new_file("smver.txt", "w");
    60     if (!out)
     62    if (out == NULL)
    6163        goto err;
    6264
    … …  
    7577        ERR_print_errors_fp(stderr);
    7678    }
     79
     80    X509_STORE_free(st);
    7781    PKCS7_free(p7);
    7882    X509_free(cacert);
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette