Merge branch 'upstream' into tizen_base

Change-Id: I2aa54578d9f7b1d2fc3ad9d50b3ceb2a2047ee7f

diff --cc Configurations/unix-Makefile.tmpl
index aac8c08,7db7578..7abc53e
--- 1/Configurations/unix-Makefile.tmpl
--- 2/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@@ -423,8 -521,8 +521,8 @@@ clean: libclea
        $(RM) core
        $(RM) tags TAGS doc-nits
        $(RM) -r test/test-runs
 -      $(RM) openssl.pc libcrypto.pc libssl.pc
 +      $(RM) openssl1.1.pc libcrypto1.1.pc libssl1.1.pc
-       -$(RM) `find . -name .git -prune -o -type l -print`
+       -$(RM) `find . -type l \! -name '.*' -print`
        $(RM) $(TARFILE)
  
  distclean: clean

diff --cc include/internal/cryptlib.h
Simple merge

diff --cc packaging/openssl1.1.spec
index 2f89bc7,0000000..d9d44ad
mode 100644,000000..100644
--- 1/packaging/openssl1.1.spec
--- /dev/null
+++ b/packaging/openssl1.1.spec
@@@ -1,116 -1,0 +1,116 @@@
- Version:    1.1.1c
 +%define openssldir %{_sysconfdir}/ssl
 +
 +Summary:    Secure Sockets Layer and cryptography libraries and tools
 +Name:       openssl1.1
++Version:    1.1.1d
 +Release:    0
 +License:    OpenSSL and Apache-2.0
 +Group:      Security/Crypto Libraries
 +Url:        https://www.openssl.org/
 +Source0:    ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 +Source1:    %{name}.manifest
 +Requires:   libopenssl11 = %{version}-%{release}
 +
 +%description
 +The OpenSSL Project is a collaborative effort to develop a robust,
 +commercial-grade, full-featured, and open source toolkit implementing
 +the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS
 +v1) protocols with full-strength cryptography. The project is managed
 +by a worldwide community of volunteers that use the Internet to
 +communicate, plan, and develop the OpenSSL toolkit and its related
 +documentation.
 +
 +%package -n libopenssl11
 +Summary:    Secure Sockets Layer and cryptography libraries
 +Group:      Security/Crypto Libraries
 +
 +%description -n libopenssl11
 +The OpenSSL Project is a collaborative effort to develop a robust,
 +commercial-grade, full-featured, and open source toolkit implementing
 +the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS
 +v1) protocols with full-strength cryptography. The project is managed
 +by a worldwide community of volunteers that use the Internet to
 +communicate, plan, and develop the OpenSSL toolkit and its related
 +documentation.
 +
 +%package -n lib%{name}-devel
 +Summary:    Secure Sockets Layer and cryptography libraries mandatory for Development
 +Group:      Development/Libraries
 +Requires:   libopenssl11 = %{version}-%{release}
 +Requires:   zlib-devel
 +Conflicts:  libopenssl-devel
 +
 +%description -n lib%{name}-devel
 +The OpenSSL Project is a collaborative effort to develop a robust,
 +commercial-grade, full-featured, and open source toolkit implementing
 +the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS
 +v1) protocols with full-strength cryptography. The project is managed
 +by a worldwide community of volunteers that use the Internet to
 +communicate, plan, and develop the OpenSSL toolkit and its related
 +documentation.
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1} .
 +
 +%build
 +%ifarch %{arm}
 +sslarch=linux-armv4
 +%endif
 +%ifarch aarch64
 +sslarch=linux-aarch64
 +%endif
 +%ifarch %{ix86}
 +sslarch=linux-elf
 +%endif
 +%ifarch x86_64
 +sslarch=linux-x86_64
 +%endif
 +
 +RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -s "s/--param=ssp-buffer-size=32//g")
 +RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -s "s/-mcpu=cortex-a15.cortex-a7//g")
 +RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -s "s/-march=armv7ve/-march=armv7-a/g")
 +RPM_OPT_FLAGS="$RPM_OPT_FLAGS -std=gnu99 -fPIC -pie"
 +
 +./Configure \
 +    --prefix=%{_prefix} --openssldir=%{openssldir} --libdir=%{_lib} \
 +    threads shared no-idea no-rc5 no-camellia no-asm no-ssl2 enable-md2 enable-weak-ssl-ciphers \
 +    ${sslarch} $RPM_OPT_FLAGS
 +
 +make %{?_smp_mflags} all
 +
 +%check
 +make test
 +
 +%install
 +rm -rf $RPM_BUILD_ROOT
 +make DESTDIR=$RPM_BUILD_ROOT install_sw install_ssldirs
 +mv $RPM_BUILD_ROOT%{openssldir}/openssl.cnf $RPM_BUILD_ROOT%{openssldir}/openssl1.1.cnf
 +
 +%files
 +%manifest %{name}.manifest
 +%license LICENSE
 +%license LICENSE.Apache-2.0
 +%{_bindir}/openssl
 +%{_bindir}/c_rehash
 +%{openssldir}/*.cnf*
 +%{openssldir}/misc
 +
 +%files -n libopenssl11
 +%manifest %{name}.manifest
 +%license LICENSE
 +%license LICENSE.Apache-2.0
 +%{_libdir}/*.so.*
 +%{_libdir}/engines-1.1/*.so
 +%post -n libopenssl11 -p /sbin/ldconfig
 +%postun -n libopenssl11 -p /sbin/ldconfig
 +
 +%files -n lib%{name}-devel
 +%manifest %{name}.manifest
 +%license LICENSE
 +%license LICENSE.Apache-2.0
 +%{_includedir}/openssl
 +%{_libdir}/*.so
 +%exclude %{_libdir}/*.a
 +%{_libdir}/pkgconfig/*.pc
 +