Merge branch 'upstream' into tizen

Change-Id: I63bbe5c52e3e8f8476f10b4e0cfbebac1c65f27d

diff --cc packaging/liboqs.spec
index 7e3ab0f,0000000..492e105
mode 100644,000000..100644
--- 1/packaging/liboqs.spec
--- /dev/null
+++ b/packaging/liboqs.spec
@@@ -1,52 -1,0 +1,52 @@@
- Version:      0.8.0
 +Summary:      C library for prototyping and experimenting with quantum-resistant cryptography
 +Name:         liboqs
++Version:      0.10.1
 +Release:      0
 +License:      MIT
 +Group:                Security/Crypto Libraries
 +Url:          https://openquantumsafe.org/
 +Source0:      %{name}-%{version}.tar.gz
 +Source1:      %{name}.manifest
 +BuildRequires:  ninja
 +BuildRequires:        cmake
 +BuildRequires:        pkgconfig(openssl3)
 +
 +%description
 +liboqs is part of the Open Quantum Safe (OQS) project led by Douglas Stebila and Michele Mosca, 
 +which aims to develop and integrate into applications quantum-safe cryptography to facilitate 
 +deployment and testing in real world contexts. In particular, OQS provides prototype integrations 
 +of liboqs into TLS and SSH, through OpenSSL and OpenSSH.
 +
 +%package -n %{name}-devel
 +Summary:        C library for with quantum-resistant cryptography for development
 +Group:          Development/Libraries
 +Requires:     %{name}
 +
 +%description -n %{name}-devel
 +liboqs is part of the Open Quantum Safe (OQS) project led by Douglas Stebila and Michele Mosca, 
 +which aims to develop and integrate into applications quantum-safe cryptography to facilitate 
 +deployment and testing in real world contexts. In particular, OQS provides prototype integrations 
 +of liboqs into TLS and SSH, through OpenSSL and OpenSSH.
 +
 +%prep
 +%setup -q
 +
 +%build
 +cmake -GNinja -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/ .
 +ninja
 +
 +%install
 +cp %{SOURCE1} .
 +DESTDIR=%{buildroot} ninja install
 +
 +%files
 +%manifest %{name}.manifest
 +%license LICENSE.txt
 +%{_libdir}/%{name}.so.*
 +
 +%files -n %{name}-devel
 +%license LICENSE.txt
 +%{_libdir}/%{name}.so
 +%{_libdir}/cmake/%{name}
 +%{_libdir}/pkgconfig/%{name}.pc
 +%{_includedir}/oqs