[X2Go-Commits] [vcxsrv] 20/24: Merge remote-tracking branch 'origin/released'

git-admin at x2go.org git-admin at x2go.org
Sun May 3 23:21:48 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 1.17.0.0
in repository vcxsrv.

commit 0f7871ff824bcf064db3ab6bdfe26645ba6c8087
Merge: 934184b 2a00e48
Author: marha <marha at users.sourceforge.net>
Date:   Mon Apr 20 23:05:23 2015 +0200

    Merge remote-tracking branch 'origin/released'
    
    Conflicts:
    	openssl/Makefile

 openssl/CHANGES                               |  524 ++++-----
 openssl/Configure                             |  114 +-
 openssl/NEWS                                  |   86 +-
 openssl/README                                |    2 +-
 openssl/apps/apps.c                           |   13 +-
 openssl/apps/ca.c                             |   21 +
 openssl/apps/cms.c                            |    4 +
 openssl/apps/dgst.c                           |   15 +-
 openssl/apps/openssl.c                        |    8 +-
 openssl/apps/pkcs7.c                          |   10 +-
 openssl/apps/rsautl.c                         |    5 +
 openssl/apps/s_cb.c                           |    5 +
 openssl/apps/s_client.c                       |   11 +-
 openssl/apps/s_server.c                       |   36 +-
 openssl/apps/s_time.c                         |    7 +-
 openssl/apps/speed.c                          |   12 +-
 openssl/apps/srp.c                            |    8 +
 openssl/apps/x509.c                           |    5 +
 openssl/crypto/aes/Makefile                   |    2 +-
 openssl/crypto/aes/aes_core.c                 |   64 +-
 openssl/crypto/aes/aes_x86core.c              |  224 ++--
 openssl/crypto/asn1/a_type.c                  |    3 +
 openssl/crypto/asn1/a_utctm.c                 |    2 +-
 openssl/crypto/asn1/asn1.h                    |    1 +
 openssl/crypto/asn1/asn1_gen.c                |    9 +-
 openssl/crypto/asn1/asn1_lib.c                |    7 +
 openssl/crypto/asn1/asn1_par.c                |    2 +-
 openssl/crypto/asn1/bio_ndef.c                |    6 +
 openssl/crypto/asn1/p8_pkey.c                 |    3 +-
 openssl/crypto/asn1/tasn_dec.c                |   24 +-
 openssl/crypto/asn1/tasn_new.c                |    7 +-
 openssl/crypto/asn1/tasn_prn.c                |    3 +
 openssl/crypto/asn1/x_bignum.c                |   69 +-
 openssl/crypto/asn1/x_long.c                  |  149 +--
 openssl/crypto/asn1/x_x509.c                  |   12 +-
 openssl/crypto/bio/b_print.c                  |   15 +-
 openssl/crypto/bio/bio.h                      |    1 +
 openssl/crypto/bio/bio_cb.c                   |    9 +-
 openssl/crypto/bio/bio_err.c                  |    3 +-
 openssl/crypto/bio/bss_dgram.c                |   15 +-
 openssl/crypto/bn/Makefile                    |    2 -
 openssl/crypto/bn/asm/modexp512-x86_64.pl     | 1497 -------------------------
 openssl/crypto/bn/bn_exp.c                    |    4 +-
 openssl/crypto/camellia/Makefile              |    2 +-
 openssl/crypto/cms/cms_pwri.c                 |    2 +
 openssl/crypto/conf/conf_def.c                |    6 +-
 openssl/crypto/conf/conf_sap.c                |   17 +-
 openssl/crypto/des/spr.h                      |  327 +++---
 openssl/crypto/dh/dh_ameth.c                  |   20 +-
 openssl/crypto/dh/dh_pmeth.c                  |    3 +
 openssl/crypto/dsa/dsa_ameth.c                |   24 +-
 openssl/crypto/dso/dso_dlfcn.c                |    7 +-
 openssl/crypto/dso/dso_vms.c                  |   19 +-
 openssl/crypto/ec/ec_asn1.c                   |   21 +-
 openssl/crypto/ec/ec_curve.c                  |    8 +-
 openssl/crypto/ec/ec_cvt.c                    |    6 +-
 openssl/crypto/ec/ecp_nistp224.c              |    2 +-
 openssl/crypto/engine/eng_fat.c               |    2 +
 openssl/crypto/engine/eng_rsax.c              |  701 ------------
 openssl/crypto/evp/Makefile                   |    2 +-
 openssl/crypto/evp/digest.c                   |    9 +-
 openssl/crypto/evp/e_aes.c                    |    2 +
 openssl/crypto/evp/evp_extra_test.c           |  489 ++++++++
 openssl/crypto/ex_data.c                      |    2 +
 openssl/crypto/modes/gcm128.c                 |    8 +
 openssl/crypto/objects/o_names.c              |   15 +-
 openssl/crypto/objects/objects.pl             |   44 +-
 openssl/crypto/objects/objxref.pl             |   37 +-
 openssl/crypto/opensslv.h                     |    6 +-
 openssl/crypto/perlasm/sparcv9_modes.pl       |    1 +
 openssl/crypto/pkcs7/pk7_doit.c               |   87 +-
 openssl/crypto/pkcs7/pk7_lib.c                |    3 +
 openssl/crypto/rand/rand_egd.c                |    1 +
 openssl/crypto/rand/rand_os2.c                |    3 +
 openssl/crypto/rsa/rsa_ameth.c                |    3 +-
 openssl/crypto/rsa/rsa_sign.c                 |   15 +-
 openssl/crypto/sha/asm/sha1-586.pl            |    2 +-
 openssl/crypto/stack/stack.c                  |    2 +-
 openssl/crypto/threads/th-lock.c              |   23 +-
 openssl/crypto/ui/ui_openssl.c                |   60 +-
 openssl/crypto/x509/x509_req.c                |    2 +
 openssl/crypto/x509v3/v3_cpols.c              |   16 +-
 openssl/crypto/x509v3/v3_utl.c                |    7 +-
 openssl/doc/apps/ciphers.pod                  |    4 +-
 openssl/doc/apps/config.pod                   |   22 +-
 openssl/doc/apps/ocsp.pod                     |   10 +-
 openssl/doc/crypto/ASN1_TIME_set.pod          |  129 +++
 openssl/doc/crypto/CMS_get0_type.pod          |   22 +-
 openssl/doc/crypto/CONF_modules_load_file.pod |   87 +-
 openssl/doc/crypto/EC_KEY_new.pod             |   22 +-
 openssl/doc/crypto/EC_POINT_new.pod           |    9 +-
 openssl/doc/crypto/OPENSSL_config.pod         |   42 +-
 openssl/doc/crypto/X509_check_host.pod        |    7 +-
 openssl/doc/crypto/d2i_CMS_ContentInfo.pod    |   29 +
 openssl/doc/crypto/d2i_ECPKParameters.pod     |    2 +-
 openssl/doc/crypto/d2i_ECPrivateKey.pod       |   67 ++
 openssl/doc/crypto/d2i_X509.pod               |   12 +-
 openssl/doc/crypto/sha.pod                    |   64 +-
 openssl/doc/ssl/SSL_CONF_CTX_set_flags.pod    |    2 +-
 openssl/doc/ssl/SSL_CONF_cmd.pod              |    5 +
 openssl/doc/ssl/SSL_CTX_set_read_ahead.pod    |   51 +
 openssl/doc/ssl/SSL_pending.pod               |    8 +-
 openssl/doc/ssl/ssl.pod                       |    7 +
 openssl/engines/ccgost/gost_eng.c             |    4 +
 openssl/engines/e_ubsec.c                     |    4 +-
 openssl/openssl.spec                          |    2 +-
 openssl/ssl/d1_both.c                         |    4 +-
 openssl/ssl/d1_lib.c                          |    5 +-
 openssl/ssl/d1_pkt.c                          |    6 +-
 openssl/ssl/dtls1.h                           |    1 +
 openssl/ssl/s2_lib.c                          |    2 +-
 openssl/ssl/s2_srvr.c                         |   60 +-
 openssl/ssl/s3_clnt.c                         |    5 +-
 openssl/ssl/s3_enc.c                          |    1 +
 openssl/ssl/s3_pkt.c                          |   13 +-
 openssl/ssl/s3_srvr.c                         |   90 +-
 openssl/ssl/ssl.h                             |    2 +-
 openssl/ssl/ssl_asn1.c                        |    4 +-
 openssl/ssl/ssl_ciph.c                        |   10 +-
 openssl/ssl/ssl_conf.c                        |   15 +
 openssl/ssl/ssl_locl.h                        |    6 +-
 openssl/ssl/ssltest.c                         |    2 +-
 openssl/ssl/t1_enc.c                          |   37 +-
 openssl/ssl/t1_lib.c                          |   26 +-
 openssl/test/Makefile                         |   28 +-
 openssl/test/cms-test.pl                      |   20 +-
 openssl/test/evp_extra_test.c                 |    1 +
 openssl/util/libeay.num                       |    1 +
 openssl/util/mkerr.pl                         |  132 +--
 openssl/util/openssl-format-source            |    2 +-
 openssl/util/pl/unix.pl                       |    1 -
 packages.txt                                  |    2 +-
 132 files changed, 2550 insertions(+), 3562 deletions(-)

diff --cc openssl/Configure
index b40094c,f776e23..81a171d
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