CVSROOT: /cvs
Module name: src
Changes by: [email protected] 2014/04/13 09:25:35
Modified files:
lib/libssl/src : CHANGES Configure FAQ INSTALL.W32 Makefile
Makefile.org NEWS PROBLEMS README e_os.h
openssl.spec
lib/libssl/src/apps: Makefile apps.c apps.h ca.c crl.c dgst.c
dhparam.c dsaparam.c genrsa.c ocsp.c
openssl.c pkcs12.c req.c s_cb.c s_client.c
s_server.c speed.c tsget verify.c x509.c
lib/libssl/src/crypto: cryptlib.c cryptlib.h crypto.h mem.c
opensslv.h symhacks.h x86_64cpuid.pl
lib/libssl/src/crypto/aes/asm: aes-x86_64.pl aesni-x86_64.pl
lib/libssl/src/crypto/asn1: a_int.c a_strex.c asn1_err.c
x_pubkey.c
lib/libssl/src/crypto/bio: bss_dgram.c bss_log.c
lib/libssl/src/crypto/bn: bn.h bn_div.c bn_gcd.c bn_lcl.h
bn_lib.c bn_nist.c
lib/libssl/src/crypto/buffer: buffer.c buffer.h
lib/libssl/src/crypto/des: des.h des_old.h set_key.c str2key.c
lib/libssl/src/crypto/dso: dso_dlfcn.c
lib/libssl/src/crypto/ec: ec.h ec_lib.c ecp_mont.c ectest.c
lib/libssl/src/crypto/ecdh: Makefile
lib/libssl/src/crypto/engine: eng_all.c eng_list.c
lib/libssl/src/crypto/err: err_all.c
lib/libssl/src/crypto/evp: Makefile bio_b64.c digest.c e_aes.c
e_aes_cbc_hmac_sha1.c e_des3.c evp.h
evp_err.c m_dss.c m_dss1.c m_sha1.c
p5_crpt2.c p_sign.c p_verify.c
lib/libssl/src/crypto/md4: md4_dgst.c md4_locl.h
lib/libssl/src/crypto/md5: md5_locl.h
lib/libssl/src/crypto/mdc2: mdc2dgst.c
lib/libssl/src/crypto/modes: Makefile
lib/libssl/src/crypto/objects: o_names.c
lib/libssl/src/crypto/ocsp: ocsp_vfy.c
lib/libssl/src/crypto/pem: pem_all.c pem_info.c pem_lib.c
pem_seal.c
lib/libssl/src/crypto/perlasm: cbc.pl
lib/libssl/src/crypto/pkcs12: p12_crt.c p12_key.c
lib/libssl/src/crypto/rand: md_rand.c rand.h rand_err.c
rand_lib.c rand_win.c randfile.c
lib/libssl/src/crypto/rc4: rc4test.c
lib/libssl/src/crypto/rc4/asm: rc4-x86_64.pl
lib/libssl/src/crypto/ripemd: rmd_dgst.c rmd_locl.h
lib/libssl/src/crypto/rsa: rsa.h rsa_chk.c rsa_eay.c rsa_oaep.c
lib/libssl/src/crypto/sha: Makefile sha1_one.c sha1dgst.c
sha_dgst.c sha_locl.h
lib/libssl/src/crypto/ui: ui_openssl.c
lib/libssl/src/crypto/x509: by_dir.c x509_cmp.c x509_vfy.c
x_all.c
lib/libssl/src/crypto/x509v3: v3_purp.c
lib/libssl/src/demos/easy_tls: Makefile cacerts.pem cert.pem
easy-tls.c easy-tls.h test.c
test.h
lib/libssl/src/demos/x509: mkreq.c
lib/libssl/src/doc/apps: CA.pl.pod config.pod crl.pod pkcs12.pod
req.pod rsa.pod s_client.pod
s_server.pod verify.pod x509.pod
lib/libssl/src/doc/crypto: ERR_get_error.pod EVP_BytesToKey.pod
EVP_DigestInit.pod
EVP_EncryptInit.pod EVP_SignInit.pod
des_modes.pod dsa.pod hmac.pod
mdc2.pod pem.pod ripemd.pod sha.pod
lib/libssl/src/doc/ssl: SSL_CTX_set_client_CA_list.pod
SSL_CTX_set_options.pod
SSL_CTX_set_verify.pod SSL_accept.pod
SSL_connect.pod SSL_do_handshake.pod
SSL_set_shutdown.pod SSL_shutdown.pod
ssl.pod
lib/libssl/src/engines: e_capi.c
lib/libssl/src/engines/vendor_defns: hwcryptohook.h
lib/libssl/src/ssl: Makefile d1_both.c d1_clnt.c d1_pkt.c
d1_srvr.c dtls1.h kssl.h s23_clnt.c
s2_clnt.c s2_pkt.c s2_srvr.c s3_both.c
s3_clnt.c s3_lib.c s3_pkt.c s3_srvr.c ssl.h
ssl3.h ssl_algs.c ssl_cert.c ssl_ciph.c
ssl_err.c ssl_lib.c ssl_locl.h ssl_rsa.c
ssltest.c t1_enc.c t1_lib.c tls1.h
lib/libssl/src/test: Makefile testssl
lib/libssl/src/util: libeay.num mk1mf.pl
lib/libssl/src/util/pl: BC-32.pl VC-32.pl
Removed files:
lib/libssl/src : install.com makevms.com
lib/libssl/src/MacOS: GUSI_Init.cpp OpenSSL.mcp.hqx
Randomizer.cpp Randomizer.h TODO
_MWERKS_GUSI_prefix.h _MWERKS_prefix.h
buildinf.h mklinks.as.hqx opensslconf.h
lib/libssl/src/MacOS/GetHTTPS.src: CPStringUtils.cpp
CPStringUtils.hpp
ErrorHandling.cpp
ErrorHandling.hpp
GetHTTPS.cpp MacSocket.cpp
MacSocket.h
lib/libssl/src/Netware: build.bat cpy_tests.bat do_tests.pl
globals.txt readme.txt set_env.bat
lib/libssl/src/VMS: TODO VMSify-conf.pl WISHLIST.TXT
install-vms.com install.com mkshared.com
multinet_shr.opt openssl_startup.com
openssl_undo.com openssl_utils.com
socketshr_shr.opt tcpip_shr_decc.opt
test-includes.com ucx_shr_decc.opt
ucx_shr_decc_log.opt ucx_shr_vaxc.opt
lib/libssl/src/apps: CA.com install-apps.com install.com
makeapps.com
lib/libssl/src/crypto: crypto-lib.com install-crypto.com
install.com
lib/libssl/src/crypto/des: des-lib.com
lib/libssl/src/crypto/threads: pthreads-vms.com
lib/libssl/src/demos/engines/rsaref: build.com
lib/libssl/src/doc/crypto: EVP_PKEY_verifyrecover.pod
lib/libssl/src/engines: makeengines.com
lib/libssl/src/ms: 32all.bat README applink.c bcb4.bat
certCA.srl certCA.ss certU.ss cmp.pl
do_ms.bat do_nasm.bat do_nt.bat do_win64a.bat
do_win64i.bat keyCA.ss keyU.ss mingw32.bat
mw.bat req2CA.ss reqCA.ss reqU.ss speed32.bat
tenc.bat tencce.bat test.bat testce.bat
testce2.bat testenc.bat testencce.bat
testpem.bat testpemce.bat testss.bat
testssce.bat tlhelp32.h tpem.bat tpemce.bat
uplink-common.pl uplink-ia64.pl uplink-x86.pl
uplink-x86_64.pl uplink.c uplink.h uplink.pl
x86asm.bat
lib/libssl/src/os2: OS2-EMX.cmd backwardify.pl
lib/libssl/src/ssl: install-ssl.com install.com ssl-lib.com
lib/libssl/src/test: bctest.com bntest.com clean_test.com
maketests.com tcrl.com testca.com
testenc.com testgen.com tests.com
testss.com testssl.com testtsa.com
tpkcs7.com tpkcs7d.com treq.com trsa.com
tsid.com tverify.com tx509.com
lib/libssl/src/util: deltree.com
Log message:
Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.