Module Name: src
Committed By: christos
Date: Tue Jun 11 14:47:52 UTC 2024
Modified Files:
src/crypto/external/bsd/openssl/dist: Configure e_os.h
src/crypto/external/bsd/openssl/dist/apps: ocsp.c req.c s_server.c
speed.c
src/crypto/external/bsd/openssl/dist/apps/lib: opt.c
src/crypto/external/bsd/openssl/dist/crypto/bio: bio_lib.c
src/crypto/external/bsd/openssl/dist/crypto/bn: bn_exp.c bn_lib.c
bn_nist.c bn_rand.c
src/crypto/external/bsd/openssl/dist/crypto/err: openssl.ec
src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c
src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_lib.c
src/crypto/external/bsd/openssl/dist/include/internal: refcount.h
src/crypto/external/bsd/openssl/dist/include/openssl: bio.h.in
src/crypto/external/bsd/openssl/dist/ssl: d1_lib.c s3_enc.c s3_lib.c
ssl_ciph.c ssl_err.c ssl_lib.c ssl_sess.c t1_enc.c t1_lib.c
src/crypto/external/bsd/openssl/dist/test: bntest.c dsatest.c
ecdsatest.c evp_extra_test.c evp_test.c
Removed Files:
src/crypto/external/bsd/openssl/dist: FAQ.md
Log Message:
Merge conflicts between 3.0.12 and 3.0.14
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssl/dist/Configure
cvs rdiff -u -r1.1.1.1 -r0 src/crypto/external/bsd/openssl/dist/FAQ.md
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssl/dist/e_os.h
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssl/dist/apps/ocsp.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/apps/req.c
cvs rdiff -u -r1.29 -r1.30 \
src/crypto/external/bsd/openssl/dist/apps/s_server.c
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssl/dist/apps/speed.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/apps/lib/opt.c
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c
cvs rdiff -u -r1.22 -r1.23 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c
cvs rdiff -u -r1.17 -r1.18 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_nist.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_rand.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/crypto/err/openssl.ec
cvs rdiff -u -r1.26 -r1.27 \
src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_lib.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/include/internal/refcount.h
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/include/openssl/bio.h.in
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssl/dist/ssl/d1_lib.c \
src/crypto/external/bsd/openssl/dist/ssl/ssl_sess.c
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssl/dist/ssl/s3_enc.c
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c
cvs rdiff -u -r1.24 -r1.25 \
src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c \
src/crypto/external/bsd/openssl/dist/ssl/ssl_lib.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssl/dist/ssl/ssl_err.c
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssl/dist/ssl/t1_enc.c
cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssl/dist/test/bntest.c \
src/crypto/external/bsd/openssl/dist/test/evp_test.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/test/dsatest.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/test/ecdsatest.c
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/dist/test/evp_extra_test.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
