[X2Go-Commits] [vcxsrv] 04/13: Merge remote-tracking branch 'origin/released'
git-admin at x2go.org
git-admin at x2go.org
Mon Mar 9 05:11:40 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to annotated tag 1.16.2.0
in repository vcxsrv.
commit 8cd093f61168a373d919c68e0ce4e04949fa4eb6
Merge: 9fc8524 a14858a
Author: marha <marha at users.sourceforge.net>
Date: Sun Oct 19 11:34:57 2014 +0200
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
openssl/crypto/opensslconf.h
openssl/CHANGES | 51 +++
openssl/Configure | 6 +
openssl/NEWS | 7 +
openssl/README | 2 +-
openssl/apps/makeapps.com | 21 +-
openssl/apps/s_client.c | 10 +
openssl/crypto/LPdir_vms.c | 7 +-
openssl/crypto/LPdir_win.c | 48 ++-
openssl/crypto/Makefile | 4 +-
openssl/crypto/aes/asm/aesni-x86_64.pl | 52 +--
openssl/crypto/asn1/a_strex.c | 1 +
openssl/crypto/bn/asm/x86_64-gcc.c | 8 +-
openssl/crypto/bn/bn_exp.c | 9 +-
openssl/crypto/bn/bn_nist.c | 6 +-
openssl/crypto/bn/exptest.c | 45 ++-
openssl/crypto/constant_time_locl.h | 216 +++++++++++++
openssl/crypto/constant_time_test.c | 330 ++++++++++++++++++++
openssl/crypto/crypto-lib.com | 67 ++--
openssl/crypto/dsa/dsa_ameth.c | 7 +-
openssl/crypto/ebcdic.h | 7 +
openssl/crypto/ec/ec.h | 2 +-
openssl/crypto/ec/ec2_smpl.c | 9 +-
openssl/crypto/ec/ec_ameth.c | 14 +-
openssl/crypto/ec/ec_asn1.c | 40 ++-
openssl/crypto/ec/ecp_mont.c | 9 +-
openssl/crypto/ec/ecp_nist.c | 9 +-
openssl/crypto/ec/ecp_smpl.c | 13 +-
openssl/crypto/ec/ectest.c | 5 +-
openssl/crypto/err/openssl.ec | 1 +
openssl/crypto/evp/Makefile | 2 +-
openssl/crypto/evp/e_aes.c | 2 +-
openssl/crypto/evp/evp_enc.c | 56 ++--
openssl/crypto/install-crypto.com | 9 +-
openssl/crypto/md5/asm/md5-x86_64.pl | 2 +-
openssl/crypto/modes/modes.h | 6 +
openssl/crypto/ocsp/ocsp_vfy.c | 7 +-
openssl/crypto/opensslv.h | 13 +-
openssl/crypto/ossl_typ.h | 7 +
openssl/crypto/pkcs7/pkcs7.h | 4 -
openssl/crypto/pqueue/pqueue.h | 6 +
openssl/crypto/rsa/Makefile | 5 +-
openssl/crypto/rsa/rsa.h | 1 +
openssl/crypto/rsa/rsa_err.c | 1 +
openssl/crypto/rsa/rsa_oaep.c | 150 +++++----
openssl/crypto/rsa/rsa_pk1.c | 103 ++++--
openssl/crypto/rsa/rsa_sign.c | 21 +-
openssl/crypto/stack/safestack.h | 8 +
openssl/doc/apps/c_rehash.pod | 81 +++++
openssl/doc/apps/dgst.pod | 68 +++-
openssl/doc/crypto/BIO_s_accept.pod | 4 +-
...MS_sign_add1_signer.pod => CMS_add1_signer.pod} | 14 +-
openssl/doc/crypto/EVP_DigestInit.pod | 30 +-
openssl/doc/crypto/EVP_DigestVerifyInit.pod | 4 +-
openssl/doc/crypto/EVP_EncryptInit.pod | 56 ++--
openssl/doc/crypto/EVP_PKEY_set1_RSA.pod | 8 +-
openssl/doc/crypto/EVP_PKEY_sign.pod | 20 +-
openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod | 15 +-
openssl/e_os.h | 12 +-
openssl/engines/makeengines.com | 23 +-
openssl/makevms.com | 17 +-
openssl/openssl.spec | 2 +-
openssl/ssl/Makefile | 86 ++---
openssl/ssl/d1_both.c | 3 +
openssl/ssl/d1_lib.c | 10 +
openssl/ssl/d1_srtp.c | 93 ++----
openssl/ssl/dtls1.h | 3 +-
openssl/ssl/s23_clnt.c | 12 +-
openssl/ssl/s23_srvr.c | 21 +-
openssl/ssl/s2_lib.c | 4 +-
openssl/ssl/s3_cbc.c | 65 +---
openssl/ssl/s3_clnt.c | 250 +++++++++++----
openssl/ssl/s3_enc.c | 2 +-
openssl/ssl/s3_lib.c | 40 ++-
openssl/ssl/s3_pkt.c | 19 +-
openssl/ssl/s3_srvr.c | 113 ++++---
openssl/ssl/srtp.h | 4 +
openssl/ssl/ssl-lib.com | 21 +-
openssl/ssl/ssl.h | 9 +
openssl/ssl/ssl3.h | 7 +-
openssl/ssl/ssl_err.c | 2 +
openssl/ssl/ssl_lib.c | 75 ++++-
openssl/ssl/t1_enc.c | 1 +
openssl/ssl/t1_lib.c | 12 +-
openssl/ssl/tls1.h | 15 +-
openssl/test/Makefile | 22 +-
openssl/test/constant_time_test.c | 1 +
openssl/test/maketests.com | 5 +-
openssl/test/tests.com | 14 +-
openssl/test/testssl | 6 +
openssl/util/mk1mf.pl | 1 +
openssl/util/mkdef.pl | 6 +-
openssl/util/ssleay.num | 8 +-
92 files changed, 2018 insertions(+), 675 deletions(-)
diff --cc openssl/Configure
index 7bbb568,6f0da76..76433b0
mode 100755,100644..100755
--- a/openssl/Configure
+++ b/openssl/Configure
--
Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git
More information about the x2go-commits
mailing list