Djam/openssl
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/openssl.git synced 2025-02-23 08:12:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated to 1.0.2o

Browse source
This commit is contained in:
Алзим 2018-03-31 19:17:02 +03:00
parent 1465999bcb
commit 06d18dc40f
4 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.abf.yml
View file

@ -1,3 +1,3 @@
sources: sources:
openssl-1.0.2n.tar.gz: 0ca2957869206de193603eca6d89f532f61680b1 openssl-1.0.2o.tar.gz: a47faaca57b47a0d9d5fb085545857cc92062691
openssl-1.0.2n.tar.gz.asc: f549adb92ede3c52e40af15d99a7d9ccb87954a7 openssl-1.0.2o.tar.gz.asc: fb092d7e7f68dbbd85cc7edc5f65f19a95c36532

13
openssl-1.0.2-test-use-localhost.patch
View file

@ -1,14 +1,15 @@
--- openssl-1.0.2/ssl/ssltest.c.test-use-localhost 2015-01-25 13:57:41.440606522 +0100 diff -Naur openssl-1.0.2o.orig/ssl/ssltest.c openssl-1.0.2o/ssl/ssltest.c
+++ openssl-1.0.2/ssl/ssltest.c 2015-01-25 13:59:04.039611530 +0100 --- openssl-1.0.2o.orig/ssl/ssltest.c 2018-03-31 19:02:09.054769078 +0300
@@ -1516,16 +1516,7 @@ int main(int argc, char *argv[]) +++ openssl-1.0.2o/ssl/ssltest.c 2018-03-31 19:02:09.070769368 +0300
@@ -1859,16 +1859,7 @@
#ifndef OPENSSL_NO_KRB5 #ifndef OPENSSL_NO_KRB5
if (c_ssl && c_ssl->kssl_ctx) { if (c_ssl && c_ssl->kssl_ctx) {
- char localhost[MAXHOSTNAMELEN + 2]; - char localhost[MAXHOSTNAMELEN + 2];
- -
- if (gethostname(localhost, sizeof localhost - 1) == 0) { - if (gethostname(localhost, sizeof(localhost) - 1) == 0) {
- localhost[sizeof localhost - 1] = '\0'; - localhost[sizeof(localhost) - 1] = '\0';
- if (strlen(localhost) == sizeof localhost - 1) { - if (strlen(localhost) == sizeof(localhost) - 1) {
- BIO_printf(bio_err, "localhost name too long\n"); - BIO_printf(bio_err, "localhost name too long\n");
- goto end; - goto end;
- } - }

16
openssl-1.0.2j-gost-engine-2.patch
View file

@ -8155,16 +8155,10 @@ diff -urN openssl-1.0.2j/engines/ccgost/README.gost openssl-1.0.2j-patched/engin
It is implemented as combination of EVP_PKEY type and EVP_MD type. It is implemented as combination of EVP_PKEY type and EVP_MD type.
USAGE OF THESE ALGORITHMS USAGE OF THESE ALGORITHMS
@@ -193,16 +195,35 @@ @@ -193,6 +195,24 @@
openssl dgst -mac gost-mac -macopt key:<32 bytes of key> datafile openssl dgst -mac gost-mac -macopt key:<32 bytes of key> datafile
- Note absense of an option that specifies digest algorithm. gost-mac
+ Note absence of an option that specifies digest algorithm. gost-mac
algorithm supports only one digest (which is actually part of
implementation of this mac) and OpenSSL is clever enough to find out
this.
+ Following mac options are supported: + Following mac options are supported:
+ +
+ key:(32 bytes of key) + key:(32 bytes of key)
@ -8183,11 +8177,13 @@ diff -urN openssl-1.0.2j/engines/ccgost/README.gost openssl-1.0.2j-patched/engin
+ EVP_DigestSignInit/EVP_DigestSignFinal, you can set both options at + EVP_DigestSignInit/EVP_DigestSignFinal, you can set both options at
+ the same time). + the same time).
+ +
Encryption with GOST 28147 CFB mode Note absence of an option that specifies digest algorithm. gost-mac
openssl enc -gost89 -out encrypted-file -in plain-text-file -k <passphrase> algorithm supports only one digest (which is actually part of
implementation of this mac) and OpenSSL is clever enough to find out
@@ -203,6 +223,8 @@
Encryption with GOST 28147 CNT mode Encryption with GOST 28147 CNT mode
openssl enc -gost89-cnt -out encrypted-file -in plain-text-file -k <passphrase> openssl enc -gost89-cnt -out encrypted-file -in plain-text-file -k <passphrase>
-
+ Encryption with GOST 28147 CBC mode + Encryption with GOST 28147 CBC mode
+ openssl enc -gost89-cbc -out encrypted-file -in plain-text-file -k <passphrase> + openssl enc -gost89-cbc -out encrypted-file -in plain-text-file -k <passphrase>

8
openssl.spec
View file

@ -14,13 +14,13 @@
%define conflict2 %mklibname openssl 0.9.8 %define conflict2 %mklibname openssl 0.9.8
# Number of threads to spawn when testing some threading fixes. # Number of threads to spawn when testing some threading fixes.
#define thread_test_threads %{?threads:%{threads}}%{!?threads:1} #define thread_test_threads %%{?threads:%%{threads}}%%{!?threads:1}
%define with_krb5 %{?_with_krb5:1}%{!?_with_krb5:0} %define with_krb5 %{?_with_krb5:1}%{!?_with_krb5:0}
Summary: Secure Sockets Layer communications libs & utils Summary: Secure Sockets Layer communications libs & utils
Name: openssl Name: openssl
Version: 1.0.2n Version: 1.0.2o
Release: 1 Release: 1
License: BSD-like License: BSD-like
Group: System/Libraries Group: System/Libraries
@ -96,6 +96,8 @@ Provides: openssl-engines = %{EVRD}
This package provides engines for openssl. This package provides engines for openssl.
%files -n %{engines_name} %files -n %{engines_name}
%doc FAQ LICENSE NEWS PROBLEMS main-doc-info/README*
%doc README README.ASN1 README.ENGINE
%attr(0755,root,root) %dir %{_libdir}/openssl-%{major}/engines %attr(0755,root,root) %dir %{_libdir}/openssl-%{major}/engines
%attr(0755,root,root) %{_libdir}/openssl-%{major}/engines/*.so %attr(0755,root,root) %{_libdir}/openssl-%{major}/engines/*.so
@ -176,6 +178,8 @@ The static libraries needed to compile apps with support for various
cryptographic algorithms and protocols, including DES, RC4, RSA and SSL. cryptographic algorithms and protocols, including DES, RC4, RSA and SSL.
%files -n %{staticname} %files -n %{staticname}
%doc FAQ LICENSE NEWS PROBLEMS main-doc-info/README*
%doc README README.ASN1 README.ENGINE
%attr(0644,root,root) %{_libdir}/lib*.a %attr(0644,root,root) %{_libdir}/lib*.a
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------