Merge branch 'dev-1.1'

diff --cc openssl-ca-certificates.patch
index 0221ac2b24fb216127fbf848597b76636ce82d27,eaca92b4bfda794a9cd5977c76bee52a2094147b..1afdbfbda0cd7ca9c6c6f49b5ad07be0a9668aaa
--- 1/openssl-ca-certificates.patch
--- 2/openssl-ca-certificates.patch
+++ b/openssl-ca-certificates.patch
@@@ -6,7 -5,7 +5,7 @@@
   #  define X509_CERT_AREA          OPENSSLDIR
   #  define X509_CERT_DIR           OPENSSLDIR "/certs"
  -#  define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
 -+#  define X509_CERT_FILE          "/etc/certs/ca-certificates.crt"
 ++#  define X509_CERT_FILE          "/etc/pki/tls/certs/ca-bundle.crt"
   #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
+  #  define CTLOG_FILE              OPENSSLDIR "/ct_log_list.cnf"
   # else
-  #  define X509_CERT_AREA          "SSLROOT:[000000]"

diff --cc openssl.spec
index ecfec628a5662cb3335b7ff3f90e3ed86b8e4d0a,7be0596fad34fe6b1ff689be252212b44320d695..c433de3d88936db7b6d21bc2ee84b00e1fa3a06d
--- 1/openssl.spec
--- 2/openssl.spec
+++ b/openssl.spec
@@@ -5,11 -2,9 +2,8 @@@
  # Conditional build:
  %bcond_without        tests   # don't perform "make tests"
  %bcond_without        zlib    # zlib: note - enables CVE-2012-4929 vulnerability
- %bcond_without        sslv2   # SSLv2: note - many flaws http://en.wikipedia.org/wiki/Transport_Layer_Security#SSL_2.0
- %bcond_without        sslv3   # SSLv3: note - enables  CVE-2014-3566 vulnerability
- %bcond_with   purify  # Compile openssl with "-DPURIFY", useful when one wants to
-                       # use valgrind debugger against openssl-linked programs
- %bcond_with   snap    # use GitHub snapshot to build branch release
+ %bcond_with   sslv2   # SSLv2: note - many flaws http://en.wikipedia.org/wiki/Transport_Layer_Security#SSL_2.0
+ %bcond_with   sslv3   # SSLv3: note - enables  CVE-2014-3566 vulnerability
 -%bcond_with   snap    # use GitHub snapshot to build branch release
  
  %include      /usr/lib/rpm/macros.perl
  Summary:      OpenSSL Toolkit libraries for the "Secure Sockets Layer" (SSL v2/v3)
@@@ -28,13 -22,12 +21,8 @@@ Version:    1.1.
  Release:      1
  License:      Apache-like
  Group:                Libraries
--%if %{without snap}
  Source0:      https://www.openssl.org/source/%{name}-%{version}.tar.gz
- # Source0-md5:        ac5eb30bf5798aa14b1ae6d0e7da58df
- %else
- Source1:      https://github.com/openssl/openssl/archive/OpenSSL_1_0_2-stable/%{name}-%{version}-dev.tar.gz
- # Source1-md5:        6b846f8a4f55f5ddfa1e0d335241840a
- %endif
+ # Source0-md5:        7079eb017429e0ffb9efb42bf80ccb21
 -%else
 -Source1:      https://github.com/openssl/openssl/archive/OpenSSL_1_1_0-stable/%{name}-%{version}-dev.tar.gz
 -%endif
  Source2:      %{name}.1.pl
  Source3:      %{name}-ssl-certificate.sh
  Source4:      %{name}-c_rehash.sh
@@@ -493,6 -472,10 +469,8 @@@ f
  %{_mandir}/man1/openssl-smime.1*
  %{_mandir}/man1/openssl-speed.1*
  %{_mandir}/man1/openssl-spkac.1*
 -%{_mandir}/man1/openssl-s_server.1*
 -%{_mandir}/man1/openssl-s_time.1*
+ %{_mandir}/man1/openssl-srp.1*
+ %{_mandir}/man1/openssl-storeutl.1*
  %{_mandir}/man1/openssl-ts.1*
  %{_mandir}/man1/openssl-tsget.1*
  %{_mandir}/man1/openssl-verify.1*