Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/openssl/dist Changes between 1.1.1h and ...
details: https://anonhg.NetBSD.org/src/rev/750c8560345e
branches: trunk
changeset: 946802:750c8560345e
user: christos <christos%NetBSD.org@localhost>
date: Thu Dec 10 00:12:35 2020 +0000
description:
Changes between 1.1.1h and 1.1.1i [08 Dec 2020]
Fixed NULL pointer deref in the GENERAL_NAME_cmp function This
function could crash if both GENERAL_NAMEs contain an EDIPARTYNAME.
If an attacker can control both items being compared then this
could lead to a possible denial of service attack. OpenSSL itself
uses the GENERAL_NAME_cmp function for two purposes:
Comparing CRL distribution point names between an available CRL
and a CRL distribution point embedded in an X509 certificate When
verifying that a timestamp response token signer matches the
timestamp authority name (exposed via the API functions
TS_RESP_verify_response and TS_RESP_verify_token) (CVE-2020-1971)
Matt Caswell
Changes between 1.1.1g and 1.1.1h [22 Sep 2020]
Certificates with explicit curve parameters are now disallowed in
verification chains if the X509_V_FLAG_X509_STRICT flag is used.
Tomas Mraz
The 'MinProtocol' and 'MaxProtocol' configuration commands now
silently ignore TLS protocol version bounds when configuring
DTLS-based contexts, and conversely, silently ignore DTLS protocol
version bounds when configuring TLS-based contexts. The commands
can be repeated to set bounds of both types. The same applies with
the corresponding "min_protocol" and "max_protocol" command-line
switches, in case some application uses both TLS and DTLS.
SSL_CTX instances that are created for a fixed protocol version
(e.g. TLSv1_server_method()) also silently ignore version bounds.
Previously attempts to apply bounds to these protocol versions
would result in an error. Now only the "version-flexible" SSL_CTX
instances are subject to limits in configuration files in command-line
options.
Viktor Dukhovni
Handshake now fails if Extended Master Secret extension is dropped
on renegotiation.
Tomas Mraz
The Oracle Developer Studio compiler will start reporting deprecated
APIs
diffstat:
crypto/external/bsd/openssl/dist/Configurations/10-main.conf | 24 +-
crypto/external/bsd/openssl/dist/Configurations/windows-makefile.tmpl | 4 +-
crypto/external/bsd/openssl/dist/NOTES.ANDROID | 4 +-
crypto/external/bsd/openssl/dist/NOTES.PERL | 2 +-
crypto/external/bsd/openssl/dist/NOTES.VMS | 2 +-
crypto/external/bsd/openssl/dist/NOTES.WIN | 10 +-
crypto/external/bsd/openssl/dist/apps/cms.c | 8 +-
crypto/external/bsd/openssl/dist/apps/genpkey.c | 8 +-
crypto/external/bsd/openssl/dist/apps/rsa8192.pem | 4 +-
crypto/external/bsd/openssl/dist/apps/x509.c | 4 +-
crypto/external/bsd/openssl/dist/appveyor.yml | 3 +-
crypto/external/bsd/openssl/dist/config | 8 +-
crypto/external/bsd/openssl/dist/crypto/aes/aes_core.c | 351 ---------
crypto/external/bsd/openssl/dist/crypto/aes/aes_ige.c | 16 +-
crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-mb-x86_64.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-sha256-x86_64.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/aes/asm/aesv8-armx.pl | 38 +-
crypto/external/bsd/openssl/dist/crypto/asn1/asn1_err.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/asn1/d2i_pr.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/asn1/x_algor.c | 34 +-
crypto/external/bsd/openssl/dist/crypto/bio/b_addr.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/bio/b_print.c | 8 +-
crypto/external/bsd/openssl/dist/crypto/bio/bss_acpt.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/bio/bss_conn.c | 36 +-
crypto/external/bsd/openssl/dist/crypto/bn/asm/rsaz-avx2.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/bn/asm/rsaz-x86_64.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-mont.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-mont5.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_gcd.c | 386 +++++----
crypto/external/bsd/openssl/dist/crypto/bn/bn_mpi.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/chacha/asm/chacha-armv8.pl | 1 +
crypto/external/bsd/openssl/dist/crypto/chacha/asm/chacha-x86.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/chacha/asm/chacha-x86_64.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/cmac/cmac.c | 21 +-
crypto/external/bsd/openssl/dist/crypto/cms/cms_lib.c | 5 +-
crypto/external/bsd/openssl/dist/crypto/cms/cms_sd.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/cms/cms_smime.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/dso/dso_win32.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/ec/asm/ecp_nistz256-armv4.pl | 6 +-
crypto/external/bsd/openssl/dist/crypto/ec/asm/ecp_nistz256-x86_64.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/ec/asm/x25519-x86_64.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec_err.c | 3 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec_local.h | 4 +-
crypto/external/bsd/openssl/dist/crypto/ec/ecp_nistp224.c | 9 +-
crypto/external/bsd/openssl/dist/crypto/ec/ecp_nistp521.c | 33 +-
crypto/external/bsd/openssl/dist/crypto/ec/ecp_nistz256.c | 302 +------
crypto/external/bsd/openssl/dist/crypto/err/openssl.txt | 7 +
crypto/external/bsd/openssl/dist/crypto/evp/bio_ok.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/evp/encode.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/mem_sec.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/modes/asm/aesni-gcm-x86_64.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-x86_64.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/modes/cbc128.c | 21 +-
crypto/external/bsd/openssl/dist/crypto/modes/ccm128.c | 24 +-
crypto/external/bsd/openssl/dist/crypto/modes/cfb128.c | 20 +-
crypto/external/bsd/openssl/dist/crypto/modes/ctr128.c | 13 +-
crypto/external/bsd/openssl/dist/crypto/modes/modes_local.h | 21 +-
crypto/external/bsd/openssl/dist/crypto/modes/ofb128.c | 13 +-
crypto/external/bsd/openssl/dist/crypto/modes/xts128.c | 26 +-
crypto/external/bsd/openssl/dist/crypto/o_str.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/o_time.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/pem/pem_err.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/pem/pem_lib.c | 34 +-
crypto/external/bsd/openssl/dist/crypto/pem/pem_pkey.c | 8 +-
crypto/external/bsd/openssl/dist/crypto/pem/pvkfmt.c | 12 +-
crypto/external/bsd/openssl/dist/crypto/pkcs7/pk7_smime.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/poly1305/asm/poly1305-armv8.pl | 8 +-
crypto/external/bsd/openssl/dist/crypto/poly1305/asm/poly1305-x86.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/poly1305/asm/poly1305-x86_64.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/rand/drbg_ctr.c | 200 +++-
crypto/external/bsd/openssl/dist/crypto/rand/drbg_lib.c | 58 +-
crypto/external/bsd/openssl/dist/crypto/rand/rand_lib.c | 2 -
crypto/external/bsd/openssl/dist/crypto/rand/rand_local.h | 19 +-
crypto/external/bsd/openssl/dist/crypto/rsa/rsa_ameth.c | 11 +-
crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-586.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-armv8.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-mb-x86_64.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/sha/asm/sha256-586.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/sha/asm/sha256-mb-x86_64.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/sha/asm/sha512-armv8.pl | 7 +-
crypto/external/bsd/openssl/dist/crypto/sha/asm/sha512-x86_64.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/store/loader_file.c | 38 +-
crypto/external/bsd/openssl/dist/crypto/store/store_lib.c | 8 +-
crypto/external/bsd/openssl/dist/crypto/ts/ts_rsp_sign.c | 2 +
crypto/external/bsd/openssl/dist/crypto/whrlpool/wp_block.c | 34 +-
crypto/external/bsd/openssl/dist/crypto/x509/x509_att.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/x509/x509_cmp.c | 2 +
crypto/external/bsd/openssl/dist/crypto/x509/x509_err.c | 3 +-
crypto/external/bsd/openssl/dist/crypto/x509/x509_local.h | 4 +-
crypto/external/bsd/openssl/dist/crypto/x509/x509_req.c | 14 +-
crypto/external/bsd/openssl/dist/crypto/x509/x509_txt.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/x509/x_pubkey.c | 9 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/pcy_data.c | 3 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/v3_alt.c | 3 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/v3_genn.c | 52 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/v3_purp.c | 64 +-
crypto/external/bsd/openssl/dist/doc/man1/CA.pl.pod | 10 +-
crypto/external/bsd/openssl/dist/doc/man1/ca.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man1/dgst.pod | 5 +-
crypto/external/bsd/openssl/dist/doc/man1/enc.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man1/ocsp.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man1/pkcs12.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man1/pkcs8.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man1/pkeyutl.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man1/s_client.pod | 8 +-
crypto/external/bsd/openssl/dist/doc/man1/s_server.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man1/s_time.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man1/sess_id.pod | 2 +-
crypto/external/bsd/openssl/dist/doc/man1/ts.pod | 94 +-
crypto/external/bsd/openssl/dist/doc/man1/tsget.pod | 30 +-
crypto/external/bsd/openssl/dist/doc/man1/verify.pod | 23 +-
crypto/external/bsd/openssl/dist/doc/man1/x509.pod | 2 +-
crypto/external/bsd/openssl/dist/doc/man3/ASN1_INTEGER_get_int64.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/ASN1_STRING_length.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/ASN1_TIME_set.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/ASN1_TYPE_get.pod | 10 +-
crypto/external/bsd/openssl/dist/doc/man3/ASYNC_WAIT_CTX_new.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/ASYNC_start_job.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/BF_encrypt.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/BIO_ADDR.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/BIO_ADDRINFO.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/BIO_connect.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/BIO_ctrl.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/BIO_get_data.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/BIO_parse_hostserv.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/BIO_read.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/BIO_s_accept.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/BIO_s_bio.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/BIO_s_connect.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/BIO_s_file.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/BIO_set_callback.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/BN_add.pod | 10 +-
crypto/external/bsd/openssl/dist/doc/man3/BN_bn2bin.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/BN_generate_prime.pod | 2 +-
crypto/external/bsd/openssl/dist/doc/man3/BN_mod_mul_montgomery.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/BN_set_bit.pod | 8 +-
crypto/external/bsd/openssl/dist/doc/man3/CMS_verify.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/CRYPTO_THREAD_run_once.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/CRYPTO_memcmp.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/DES_random_key.pod | 8 +-
crypto/external/bsd/openssl/dist/doc/man3/DH_get0_pqg.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/DH_set_method.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/DSA_set_method.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/DTLSv1_listen.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/ECDSA_SIG_new.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/EC_GROUP_new.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/EC_KEY_new.pod | 12 +-
crypto/external/bsd/openssl/dist/doc/man3/EC_POINT_new.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/ENGINE_add.pod | 22 +-
crypto/external/bsd/openssl/dist/doc/man3/ERR_get_error.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/ERR_print_errors.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/ERR_put_error.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/EVP_DigestInit.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/EVP_DigestSignInit.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/EVP_DigestVerifyInit.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/EVP_EncodeInit.pod | 8 +-
crypto/external/bsd/openssl/dist/doc/man3/EVP_EncryptInit.pod | 27 +-
crypto/external/bsd/openssl/dist/doc/man3/EVP_OpenInit.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/EVP_PKEY_CTX_ctrl.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/EVP_PKEY_CTX_new.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/EVP_PKEY_keygen.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/EVP_PKEY_new.pod | 3 +-
crypto/external/bsd/openssl/dist/doc/man3/EVP_SealInit.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/EVP_SignInit.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/EVP_VerifyInit.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/HMAC.pod | 8 +-
crypto/external/bsd/openssl/dist/doc/man3/OCSP_cert_to_id.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/OCSP_request_add1_nonce.pod | 2 +-
crypto/external/bsd/openssl/dist/doc/man3/OCSP_resp_find_status.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/OCSP_sendreq_new.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/OPENSSL_LH_COMPFUNC.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/OPENSSL_config.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/OPENSSL_ia32cap.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/OPENSSL_init_crypto.pod | 12 +-
crypto/external/bsd/openssl/dist/doc/man3/OPENSSL_init_ssl.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/OSSL_STORE_open.pod | 33 +-
crypto/external/bsd/openssl/dist/doc/man3/PEM_read_bio_PrivateKey.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/PKCS7_verify.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/RAND_DRBG_new.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/RAND_DRBG_set_callbacks.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/RAND_add.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/RAND_load_file.pod | 8 +-
crypto/external/bsd/openssl/dist/doc/man3/RSA_blinding_on.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/RSA_private_encrypt.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/RSA_set_method.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/SHA256_Init.pod | 5 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CONF_cmd.pod | 39 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_dane_enable.pod | 8 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set_alpn_select_cb.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set_generate_session_id.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set_info_callback.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set_max_cert_list.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set_mode.pod | 22 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set_options.pod | 20 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set_psk_client_callback.pod | 8 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set_read_ahead.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set_security_level.pod | 8 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set_session_cache_mode.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set_session_id_context.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set_session_ticket_cb.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set_split_send_fragment.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod | 8 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set_tlsext_ticket_key_cb.pod | 19 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_use_psk_identity_hint.pod | 8 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_accept.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_alloc_buffers.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_connect.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_do_handshake.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_get_all_async_fds.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_get_error.pod | 8 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_new.pod | 75 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_pending.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_read.pod | 8 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_read_early_data.pod | 19 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_set1_host.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_set_bio.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_set_fd.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_set_shutdown.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_shutdown.pod | 24 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_state_string.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_want.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_write.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/UI_UTIL_read_pw.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/UI_create_method.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/UI_new.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/X509V3_get_d2i.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/X509_ALGOR_dup.pod | 18 +-
crypto/external/bsd/openssl/dist/doc/man3/X509_LOOKUP_hash_dir.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/X509_LOOKUP_meth_new.pod | 2 +-
crypto/external/bsd/openssl/dist/doc/man3/X509_STORE_CTX_get_error.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/X509_STORE_CTX_new.pod | 8 +-
crypto/external/bsd/openssl/dist/doc/man3/X509_STORE_CTX_set_verify_cb.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/X509_STORE_set_verify_cb_func.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/X509_VERIFY_PARAM_set_flags.pod | 17 +-
crypto/external/bsd/openssl/dist/doc/man3/X509_check_ca.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/X509_check_host.pod | 10 +-
crypto/external/bsd/openssl/dist/doc/man3/X509_check_issued.pod | 19 +-
crypto/external/bsd/openssl/dist/doc/man3/X509_check_purpose.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/X509_get0_signature.pod | 22 +-
crypto/external/bsd/openssl/dist/doc/man3/X509v3_get_ext_by_NID.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/d2i_DHparams.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/d2i_X509.pod | 12 +-
crypto/external/bsd/openssl/dist/doc/man5/config.pod | 17 +-
crypto/external/bsd/openssl/dist/doc/man5/x509v3_config.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man7/SM2.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man7/evp.pod | 14 +-
crypto/external/bsd/openssl/dist/doc/man7/ossl_store.pod | 4 +-
crypto/external/bsd/openssl/dist/fuzz/asn1.c | 3 +-
crypto/external/bsd/openssl/dist/include/openssl/asn1err.h | 8 +-
crypto/external/bsd/openssl/dist/include/openssl/e_os2.h | 4 +-
crypto/external/bsd/openssl/dist/include/openssl/ec.h | 4 +-
crypto/external/bsd/openssl/dist/include/openssl/ecerr.h | 3 +-
crypto/external/bsd/openssl/dist/include/openssl/opensslconf.h.in | 7 +-
crypto/external/bsd/openssl/dist/include/openssl/opensslv.h | 4 +-
crypto/external/bsd/openssl/dist/include/openssl/pemerr.h | 4 +-
crypto/external/bsd/openssl/dist/include/openssl/ssl.h | 4 +-
crypto/external/bsd/openssl/dist/include/openssl/ssl3.h | 5 +-
crypto/external/bsd/openssl/dist/include/openssl/x509.h | 7 +-
crypto/external/bsd/openssl/dist/include/openssl/x509_vfy.h | 6 +-
crypto/external/bsd/openssl/dist/include/openssl/x509err.h | 7 +-
crypto/external/bsd/openssl/dist/ssl/bio_ssl.c | 3 +-
crypto/external/bsd/openssl/dist/ssl/record/rec_layer_d1.c | 6 +-
crypto/external/bsd/openssl/dist/ssl/record/ssl3_buffer.c | 4 +-
crypto/external/bsd/openssl/dist/ssl/ssl_conf.c | 9 +-
crypto/external/bsd/openssl/dist/ssl/ssl_rsa.c | 28 +-
crypto/external/bsd/openssl/dist/ssl/statem/extensions.c | 14 +-
crypto/external/bsd/openssl/dist/ssl/statem/extensions_srvr.c | 2 +-
crypto/external/bsd/openssl/dist/ssl/statem/statem_clnt.c | 16 +-
crypto/external/bsd/openssl/dist/ssl/statem/statem_lib.c | 35 +-
crypto/external/bsd/openssl/dist/ssl/statem/statem_srvr.c | 2 +-
crypto/external/bsd/openssl/dist/ssl/t1_trce.c | 23 +-
crypto/external/bsd/openssl/dist/ssl/tls13_enc.c | 11 +-
crypto/external/bsd/openssl/dist/test/asn1_decode_test.c | 38 +-
crypto/external/bsd/openssl/dist/test/asn1_encode_test.c | 35 +-
crypto/external/bsd/openssl/dist/test/bioprinttest.c | 3 +-
crypto/external/bsd/openssl/dist/test/build.info | 9 +
crypto/external/bsd/openssl/dist/test/certs/ca-cert-ec-explicit.pem | 19 +
crypto/external/bsd/openssl/dist/test/certs/ca-cert-ec-named.pem | 14 +
crypto/external/bsd/openssl/dist/test/certs/ca-key-ec-explicit.pem | 10 +
crypto/external/bsd/openssl/dist/test/certs/ca-key-ec-named.pem | 5 +
crypto/external/bsd/openssl/dist/test/certs/ee-cert-ec-explicit.pem | 16 +
crypto/external/bsd/openssl/dist/test/certs/ee-cert-ec-named-explicit.pem | 11 +
crypto/external/bsd/openssl/dist/test/certs/ee-cert-ec-named-named.pem | 11 +
crypto/external/bsd/openssl/dist/test/certs/ee-key-ec-explicit.pem | 10 +
crypto/external/bsd/openssl/dist/test/certs/ee-key-ec-named-explicit.pem | 5 +
crypto/external/bsd/openssl/dist/test/certs/ee-key-ec-named-named.pem | 5 +
crypto/external/bsd/openssl/dist/test/certs/ee-self-signed.pem | 19 +
crypto/external/bsd/openssl/dist/test/certs/root-expired.pem | 18 +
crypto/external/bsd/openssl/dist/test/certs/setup.sh | 20 +-
crypto/external/bsd/openssl/dist/test/cmactest.c | 210 +++++
crypto/external/bsd/openssl/dist/test/drbgtest.c | 81 +-
crypto/external/bsd/openssl/dist/test/ec_internal_test.c | 103 ++-
crypto/external/bsd/openssl/dist/test/handshake_helper.c | 5 +-
crypto/external/bsd/openssl/dist/test/recipes/04-test_pem.t | 5 +-
crypto/external/bsd/openssl/dist/test/recipes/04-test_pem_data/cert-254-chars-at-the-end.pem | 6 +
crypto/external/bsd/openssl/dist/test/recipes/04-test_pem_data/cert-254-chars-in-the-middle.pem | 5 +
crypto/external/bsd/openssl/dist/test/recipes/04-test_pem_data/cert-oneline-multiple-of-254.pem | 3 +
crypto/external/bsd/openssl/dist/test/recipes/05-test_cmac.t | 12 +
crypto/external/bsd/openssl/dist/test/recipes/15-test_ec.t | 56 +-
crypto/external/bsd/openssl/dist/test/recipes/15-test_genec.t | 306 +++++++
crypto/external/bsd/openssl/dist/test/recipes/20-test_dgst.t | 104 ++
crypto/external/bsd/openssl/dist/test/recipes/25-test_req.t | 44 +-
crypto/external/bsd/openssl/dist/test/recipes/25-test_verify.t | 30 +-
crypto/external/bsd/openssl/dist/test/sslapitest.c | 201 +++++-
crypto/external/bsd/openssl/dist/test/tested25519.pem | 3 +
crypto/external/bsd/openssl/dist/test/tested25519pub.pem | 3 +
crypto/external/bsd/openssl/dist/test/tested448.pem | 4 +
crypto/external/bsd/openssl/dist/test/tested448pub.pem | 4 +
crypto/external/bsd/openssl/dist/test/tls13encryptiontest.c | 4 +-
crypto/external/bsd/openssl/dist/test/v3nametest.c | 346 ++++++++-
crypto/external/bsd/openssl/dist/util/libcrypto.num | 4 +
crypto/external/bsd/openssl/dist/util/mkrc.pl | 4 +-
312 files changed, 3569 insertions(+), 1878 deletions(-)
diffs (truncated from 12122 to 300 lines):
diff -r ce7a9dfc906b -r 750c8560345e crypto/external/bsd/openssl/dist/Configurations/10-main.conf
--- a/crypto/external/bsd/openssl/dist/Configurations/10-main.conf Wed Dec 09 15:28:38 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/Configurations/10-main.conf Thu Dec 10 00:12:35 2020 +0000
@@ -741,7 +741,7 @@
inherit_from => [ "linux-generic32", asm("mips64_asm") ],
cflags => add("-mabi=n32"),
cxxflags => add("-mabi=n32"),
- bn_ops => "SIXTY_FOUR_BIT RC4_CHAR",
+ bn_ops => "RC4_CHAR",
perlasm_scheme => "n32",
multilib => "32",
},
@@ -1125,7 +1125,7 @@
CFLAGS => picker(debug => "-O0 -g",
release => "-O"),
cflags => add(threads("-pthread")),
- ex_libs => threads("-pthread"),
+ ex_libs => add(threads("-pthread")),
bn_ops => "BN_LLONG RC4_CHAR",
perlasm_scheme => "aix32",
shared_ldflag => add_before("-shared -static-libgcc"),
@@ -1138,7 +1138,7 @@
CFLAGS => picker(debug => "-O0 -g",
release => "-O"),
cflags => combine("-maix64", threads("-pthread")),
- ex_libs => threads("-pthread"),
+ ex_libs => add(threads("-pthread")),
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
perlasm_scheme => "aix64",
shared_ldflag => add_before("-shared -static-libgcc"),
@@ -1154,7 +1154,7 @@
cflags => combine("-q32 -qmaxmem=16384 -qro -qroconst",
threads("-qthreaded")),
cppflags => threads("-D_THREAD_SAFE"),
- ex_libs => threads("-lpthreads"),
+ ex_libs => add(threads("-lpthreads")),
bn_ops => "BN_LLONG RC4_CHAR",
perlasm_scheme => "aix32",
shared_cflag => "-qpic",
@@ -1169,7 +1169,7 @@
cflags => combine("-q64 -qmaxmem=16384 -qro -qroconst",
threads("-qthreaded")),
cppflags => threads("-D_THREAD_SAFE"),
- ex_libs => threads("-lpthreads"),
+ ex_libs => add(threads("-lpthreads")),
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
perlasm_scheme => "aix64",
dso_scheme => "dlfcn",
@@ -1365,9 +1365,9 @@
}
push @ex_libs, '$(PORTSDK_LIBPATH)/portlib.lib'
if (defined(env('PORTSDK_LIBPATH')));
- push @ex_libs, ' /nodefaultlib coredll.lib corelibc.lib'
- if (env('TARGETCPU') eq "X86");
- return @ex_libs;
+ push @ex_libs, '/nodefaultlib coredll.lib corelibc.lib'
+ if (env('TARGETCPU') =~ /^X86|^ARMV4[IT]/);
+ return join(" ", @ex_libs);
}),
},
@@ -1557,6 +1557,14 @@
bn_ops => "SIXTY_FOUR_BIT_LONG",
perlasm_scheme => "macosx",
},
+ "darwin64-arm64-cc" => {
+ inherit_from => [ "darwin-common", asm("aarch64_asm") ],
+ CFLAGS => add("-Wall"),
+ cflags => add("-arch arm64"),
+ lib_cppflags => add("-DL_ENDIAN"),
+ bn_ops => "SIXTY_FOUR_BIT_LONG",
+ perlasm_scheme => "ios64",
+ },
##### GNU Hurd
"hurd-x86" => {
diff -r ce7a9dfc906b -r 750c8560345e crypto/external/bsd/openssl/dist/Configurations/windows-makefile.tmpl
--- a/crypto/external/bsd/openssl/dist/Configurations/windows-makefile.tmpl Wed Dec 09 15:28:38 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/Configurations/windows-makefile.tmpl Thu Dec 10 00:12:35 2020 +0000
@@ -211,8 +211,8 @@
join(' ', $target{cppflags} || (),
(map { '-D'.quotify1($_) } @{$target{defines}},
@{$config{defines}}),
- (map { '-I'.quotify1($_) } @{$target{includes}},
- @{$config{includes}}),
+ (map { '-I'.'"'.$_.'"' } @{$target{includes}},
+ @{$config{includes}}),
@{$config{cppflags}}) -}
CNF_CFLAGS={- join(' ', $target{cflags} || (),
@{$config{cflags}}) -}
diff -r ce7a9dfc906b -r 750c8560345e crypto/external/bsd/openssl/dist/NOTES.ANDROID
--- a/crypto/external/bsd/openssl/dist/NOTES.ANDROID Wed Dec 09 15:28:38 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/NOTES.ANDROID Thu Dec 10 00:12:35 2020 +0000
@@ -6,8 +6,8 @@
-------------------
Beside basic tools like perl and make you'll need to download the Android
- NDK. It's available for Linux, Mac OS X and Windows, but only Linux
- version was actually tested. There is no reason to believe that Mac OS X
+ NDK. It's available for Linux, macOS and Windows, but only Linux
+ version was actually tested. There is no reason to believe that macOS
wouldn't work. And as for Windows, it's unclear which "shell" would be
suitable, MSYS2 might have best chances. NDK version should play lesser
role, the goal is to support a range of most recent versions.
diff -r ce7a9dfc906b -r 750c8560345e crypto/external/bsd/openssl/dist/NOTES.PERL
--- a/crypto/external/bsd/openssl/dist/NOTES.PERL Wed Dec 09 15:28:38 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/NOTES.PERL Thu Dec 10 00:12:35 2020 +0000
@@ -109,7 +109,7 @@
$ cpan -f -i Text::Template
- Note: on VMS, you must quote any argument that contains upper case
+ Note: on VMS, you must quote any argument that contains uppercase
characters, so the lines above would be:
$ cpan -i "Text::Template"
diff -r ce7a9dfc906b -r 750c8560345e crypto/external/bsd/openssl/dist/NOTES.VMS
--- a/crypto/external/bsd/openssl/dist/NOTES.VMS Wed Dec 09 15:28:38 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/NOTES.VMS Thu Dec 10 00:12:35 2020 +0000
@@ -18,7 +18,7 @@
An ANSI C compiled is needed among other things. This means that
VAX C is not and will not be supported.
- We have only tested with DEC C (a.k.a HP VMS C / VSI C) and require
+ We have only tested with DEC C (aka HP VMS C / VSI C) and require
version 7.1 or later. Compiling with a different ANSI C compiler may
require some work.
diff -r ce7a9dfc906b -r 750c8560345e crypto/external/bsd/openssl/dist/NOTES.WIN
--- a/crypto/external/bsd/openssl/dist/NOTES.WIN Wed Dec 09 15:28:38 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/NOTES.WIN Thu Dec 10 00:12:35 2020 +0000
@@ -12,11 +12,11 @@
and require --cross-compile-prefix option. While on MSYS[2] it's solved
rather by placing gcc that produces "MinGW binary" code 1st on $PATH.
This is customarily source of confusion. "Hosted" applications "live" in
- emulated file system name space with POSIX-y root, mount points, /dev
+ emulated filesystem name space with POSIX-y root, mount points, /dev
and even /proc. Confusion is intensified by the fact that MSYS2 shell
(or rather emulated execve(2) call) examines the binary it's about to
start, and if it's found *not* to be linked with MSYS2 POSIX-y thing,
- command line arguments that look like file names get translated from
+ command line arguments that look like filenames get translated from
emulated name space to "native". For example '/c/some/where' becomes
'c:\some\where', '/dev/null' - 'nul'. This creates an illusion that
there is no difference between MSYS2 shell and "MinGW binary", but
@@ -26,7 +26,7 @@
it's referred to in quotes here, as "MinGW binary", it's just as
"native" as it can get.)
- Visual C++ builds, a.k.a. VC-*
+ Visual C++ builds, aka VC-*
==============================
Requirement details
@@ -47,7 +47,7 @@
the other hand oldest one is known not to work. Everything between
falls into best-effort category.
- - Netwide Assembler, a.k.a. NASM, available from https://www.nasm.us,
+ - Netwide Assembler, aka NASM, available from https://www.nasm.us,
is required. Note that NASM is the only supported assembler. Even
though Microsoft provided assembler is NOT supported, contemporary
64-bit version is exercised through continuous integration of
@@ -132,7 +132,7 @@
If you link with static OpenSSL libraries then you're expected to
additionally link your application with WS2_32.LIB, GDI32.LIB,
ADVAPI32.LIB, CRYPT32.LIB and USER32.LIB. Those developing
- non-interactive service applications might feel concerned about
+ noninteractive service applications might feel concerned about
linking with GDI32.LIB and USER32.LIB, as they are justly associated
with interactive desktop, which is not available to service
processes. The toolkit is designed to detect in which context it's
diff -r ce7a9dfc906b -r 750c8560345e crypto/external/bsd/openssl/dist/apps/cms.c
--- a/crypto/external/bsd/openssl/dist/apps/cms.c Wed Dec 09 15:28:38 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/apps/cms.c Thu Dec 10 00:12:35 2020 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -545,9 +545,11 @@
if (key_param == NULL || key_param->idx != keyidx) {
cms_key_param *nparam;
nparam = app_malloc(sizeof(*nparam), "key param buffer");
+ if ((nparam->param = sk_OPENSSL_STRING_new_null()) == NULL) {
+ OPENSSL_free(nparam);
+ goto end;
+ }
nparam->idx = keyidx;
- if ((nparam->param = sk_OPENSSL_STRING_new_null()) == NULL)
- goto end;
nparam->next = NULL;
if (key_first == NULL)
key_first = nparam;
diff -r ce7a9dfc906b -r 750c8560345e crypto/external/bsd/openssl/dist/apps/genpkey.c
--- a/crypto/external/bsd/openssl/dist/apps/genpkey.c Wed Dec 09 15:28:38 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/apps/genpkey.c Thu Dec 10 00:12:35 2020 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -177,9 +177,12 @@
goto end;
}
+ ret = 0;
+
if (rv <= 0) {
BIO_puts(bio_err, "Error writing key\n");
ERR_print_errors(bio_err);
+ ret = 1;
}
if (text) {
@@ -191,11 +194,10 @@
if (rv <= 0) {
BIO_puts(bio_err, "Error printing key\n");
ERR_print_errors(bio_err);
+ ret = 1;
}
}
- ret = 0;
-
end:
EVP_PKEY_free(pkey);
EVP_PKEY_CTX_free(ctx);
diff -r ce7a9dfc906b -r 750c8560345e crypto/external/bsd/openssl/dist/apps/rsa8192.pem
--- a/crypto/external/bsd/openssl/dist/apps/rsa8192.pem Wed Dec 09 15:28:38 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/apps/rsa8192.pem Thu Dec 10 00:12:35 2020 +0000
@@ -1,5 +1,4 @@
-----BEGIN RSA PRIVATE KEY-----
-
MIISKAIBAAKCBAEAiQ2f1X6Bte1DKD0OoCBKEikzPW+5w3oXk3WwnE97Wxzy6wJZ
ebbZC3CZKKBnJeBMrysPf+lK+9+fP6Vm8bp1wvbcSIA59BDrX6irFSuM/bdnkbuF
MFlDjt+uVrxwoyqfPi2IPot1HQg3l5mdyBqcTWvbOnU2L9HZxJfPUCjfzdTMPrMY
@@ -62,7 +61,7 @@
yO7iBUNJzv6Qh22malLp4P8gzACkD7DGlSTnoB5cLwcjmDGg+i9WrUBbOiVTeQfZ
kOj1o+Tz35ndpq/DDUVlqliB9krcxva+QHeJPH53EGI+YVg1nD+s/vUDZ3mQMGX9
DQou2L8uU6RnWNv/BihGcL8QvS4Ty6QyPOUPpD3zc70JQAEcQk9BxQNaELgJX0IN
-22cYn22tYvElew9G41OpDqzBRcfbdJmKXQ2HcroShutYJQRGUpAXHk24fy6JVkIU
+2cYUn22tYvElew9G41OpDqzBRcfbdJmKXQ2HcroShutYJQRGUpAXHk24fy6JVkIU
ojF5U6cwextMja1ZIIZgh9eugIRUeIE7319nQNDzuXWjRCcoBLA25P7wnpHWDRpz
D9ovXCIvdja74lL5psqobV6L5+fbLPkSgXoImKR0LQKCAgAIC9Jk8kxumCyIVGCP
PeM5Uby9M3GMuKrfYsn0Y5e97+kSJF1dpojTodBgR2KQar6eVrvXt+8uZCcIjfx8
@@ -98,4 +97,3 @@
rMlMLtKfp2w8HlMZpsUlToNCx6CI+tJrohzcs3BAVAbjFAXRKWGijB1rxwyDdHPv
I+/wJTNaRNPQ1M0SwtEL/zJd21y3KSPn4eL+GP3efhlDSjtlDvZqkdAUsU8=
-----END RSA PRIVATE KEY-----
-
diff -r ce7a9dfc906b -r 750c8560345e crypto/external/bsd/openssl/dist/apps/x509.c
--- a/crypto/external/bsd/openssl/dist/apps/x509.c Wed Dec 09 15:28:38 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/apps/x509.c Thu Dec 10 00:12:35 2020 +0000
@@ -140,9 +140,9 @@
{"", OPT_MD, '-', "Any supported digest"},
#ifndef OPENSSL_NO_MD5
{"subject_hash_old", OPT_SUBJECT_HASH_OLD, '-',
- "Print old-style (MD5) issuer hash value"},
+ "Print old-style (MD5) subject hash value"},
{"issuer_hash_old", OPT_ISSUER_HASH_OLD, '-',
- "Print old-style (MD5) subject hash value"},
+ "Print old-style (MD5) issuer hash value"},
#endif
#ifndef OPENSSL_NO_ENGINE
{"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
diff -r ce7a9dfc906b -r 750c8560345e crypto/external/bsd/openssl/dist/appveyor.yml
--- a/crypto/external/bsd/openssl/dist/appveyor.yml Wed Dec 09 15:28:38 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/appveyor.yml Thu Dec 10 00:12:35 2020 +0000
@@ -46,7 +46,8 @@
- cd ..
- ps: >-
if (-not $env:APPVEYOR_PULL_REQUEST_NUMBER`
- -or (&git log -2 | Select-String "\[extended tests\]") ) {
+ -or (&git log -1 $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT |
+ Select-String "\[extended tests\]") ) {
$env:EXTENDED_TESTS="yes"
}
diff -r ce7a9dfc906b -r 750c8560345e crypto/external/bsd/openssl/dist/config
--- a/crypto/external/bsd/openssl/dist/config Wed Dec 09 15:28:38 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/config Thu Dec 10 00:12:35 2020 +0000
@@ -253,11 +253,8 @@
Power*)
echo "ppc-apple-darwin${VERSION}"
;;
- x86_64)
- echo "x86_64-apple-darwin${VERSION}"
- ;;
*)
- echo "i686-apple-darwin${VERSION}"
+ echo "${MACHINE}-apple-darwin${VERSION}"
;;
esac
exit 0
@@ -497,6 +494,9 @@
Home |
Main Index |
Thread Index |
Old Index