[openssl/f18: 50/50] Merge branch 'f20' into f18

[Tomáš Mráz]

commit 8d26a664b63bd8e23929b8fcb30387c498f9b5cf
Merge: 86c6006 62d89f3
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Fri Dec 20 14:53:22 2013 +0100

    Merge branch 'f20' into f18
    
    Conflicts:
    	openssl-1.0.1e-fips-ctor.patch
    	openssl.spec

 openssl-1.0.1e-compat-symbols.patch |   46 ++
 openssl-1.0.1e-cve-2013-6449.patch  |   88 +++
 openssl-1.0.1e-new-fips-reqs.patch  | 1070 +++++++++++++++++++++++++++++++++++
 openssl-1.0.1e-no-md5-verify.patch  |   25 +
 openssl-1.0.1e-weak-ciphers.patch   |   12 +
 openssl-fips.conf                   |    2 +
 openssl.spec                        |   35 ++-
 7 files changed, 1277 insertions(+), 1 deletions(-)
---