Lainports/opnsense-ports
3
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*/*: sync with upstream

Browse source 
Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2018-09-21 07:08:19 +02:00
parent 282eef91cc
commit 407f50052a
168 changed files with 13178 additions and 1212 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
archivers/py-brotli/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= brotli
PORTVERSION= 1.0.5
PORTREVISION= 1
PORTVERSION= 1.0.6
DISTVERSIONPREFIX= v
CATEGORIES= archivers
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -14,8 +13,8 @@ COMMENT= Generic-purpose lossless compression algorithm
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_PYTHON= autoplist concurrent distutils
USES= compiler:c++0x python shebangfix
USE_PYTHON= autoplist concurrent distutils
PLIST_FILES= bin/brotli

6
archivers/py-brotli/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1530456837
SHA256 (google-brotli-v1.0.5_GH0.tar.gz) = 3d5bedd48edb909fe3b87cb99f7d139b987ef6f1616b7e22d74e928270a2fd20
SIZE (google-brotli-v1.0.5_GH0.tar.gz) = 23825684
TIMESTAMP = 1537456471
SHA256 (google-brotli-v1.0.6_GH0.tar.gz) = ce94b7f48af5e8f444c3949ca93201c1b4bb40da633db084e900133ce87848db
SIZE (google-brotli-v1.0.6_GH0.tar.gz) = 23827656

2
audio/fasttracker2/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= fasttracker2
DISTVERSION= 0.1-b97
DISTVERSION= 0.1-b99
CATEGORIES= audio
MASTER_SITES= https://16-bits.org/ \
LOCAL/ehaupt

6
audio/fasttracker2/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1537216167
SHA256 (ft2clone-b97-code.zip) = 7ec42e08366ec8259c429841158b4696306826fc134ab62fa7db11ba36b3f48a
SIZE (ft2clone-b97-code.zip) = 4564329
TIMESTAMP = 1537451742
SHA256 (ft2clone-b99-code.zip) = 8c7f76ec7411a9f7eae26e160d8ee6e165c7fb3b345beaa136046149a750f66a
SIZE (ft2clone-b99-code.zip) = 4562580

10
biology/py-cutadapt/Makefile
View file

@ -1,20 +1,22 @@
# $FreeBSD$
PORTNAME= cutadapt
PORTVERSION= 1.14
PORTVERSION= 1.18
CATEGORIES= biology python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= jwb@FreeBSD.org
COMMENT= Finds and removes adapter sequences, primers, poly-A tails, etc
COMMENT= Trim adapters from high-throughput sequencing reads
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xopen>0:archivers/py-xopen@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xopen>=0.3.2:archivers/py-xopen@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}bz2file>=0.98:archivers/py-bz2file@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils py3kplist
USE_PYTHON= autoplist concurrent distutils
post-install:
@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cutadapt/*.so

6
biology/py-cutadapt/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1509552013
SHA256 (cutadapt-1.14.tar.gz) = f32990a8b2f8b53f8f4c723ada3d256a8e8476febdd296506764cc8e83397d3d
SIZE (cutadapt-1.14.tar.gz) = 283631
TIMESTAMP = 1536508727
SHA256 (cutadapt-1.18.tar.gz) = 17aabf9b19d09a426d96030a83ad003c97b26dba9d45bf5570d33088fcd533f9
SIZE (cutadapt-1.18.tar.gz) = 342050

43
biology/py-cutadapt/pkg-plist
View file

@ -1,43 +0,0 @@
bin/cutadapt
%%PYTHON_SITELIBDIR%%/cutadapt/__init__.py
%%PYTHON_SITELIBDIR%%/cutadapt/__init__.pyc
%%PYTHON_SITELIBDIR%%/cutadapt/__init__.pyo
%%PYTHON_SITELIBDIR%%/cutadapt/_align.so
%%PYTHON_SITELIBDIR%%/cutadapt/_qualtrim.so
%%PYTHON_SITELIBDIR%%/cutadapt/_seqio.so
%%PYTHON_SITELIBDIR%%/cutadapt/_version.py
%%PYTHON_SITELIBDIR%%/cutadapt/_version.pyc
%%PYTHON_SITELIBDIR%%/cutadapt/_version.pyo
%%PYTHON_SITELIBDIR%%/cutadapt/adapters.py
%%PYTHON_SITELIBDIR%%/cutadapt/adapters.pyc
%%PYTHON_SITELIBDIR%%/cutadapt/adapters.pyo
%%PYTHON_SITELIBDIR%%/cutadapt/align.py
%%PYTHON_SITELIBDIR%%/cutadapt/align.pyc
%%PYTHON_SITELIBDIR%%/cutadapt/align.pyo
%%PYTHON_SITELIBDIR%%/cutadapt/colorspace.py
%%PYTHON_SITELIBDIR%%/cutadapt/colorspace.pyc
%%PYTHON_SITELIBDIR%%/cutadapt/colorspace.pyo
%%PYTHON_SITELIBDIR%%/cutadapt/compat.py
%%PYTHON_SITELIBDIR%%/cutadapt/compat.pyc
%%PYTHON_SITELIBDIR%%/cutadapt/compat.pyo
%%PYTHON_SITELIBDIR%%/cutadapt/filters.py
%%PYTHON_SITELIBDIR%%/cutadapt/filters.pyc
%%PYTHON_SITELIBDIR%%/cutadapt/filters.pyo
%%PYTHON_SITELIBDIR%%/cutadapt/modifiers.py
%%PYTHON_SITELIBDIR%%/cutadapt/modifiers.pyc
%%PYTHON_SITELIBDIR%%/cutadapt/modifiers.pyo
%%PYTHON_SITELIBDIR%%/cutadapt/qualtrim.py
%%PYTHON_SITELIBDIR%%/cutadapt/qualtrim.pyc
%%PYTHON_SITELIBDIR%%/cutadapt/qualtrim.pyo
%%PYTHON_SITELIBDIR%%/cutadapt/report.py
%%PYTHON_SITELIBDIR%%/cutadapt/report.pyc
%%PYTHON_SITELIBDIR%%/cutadapt/report.pyo
%%PYTHON_SITELIBDIR%%/cutadapt/scripts/__init__.py
%%PYTHON_SITELIBDIR%%/cutadapt/scripts/__init__.pyc
%%PYTHON_SITELIBDIR%%/cutadapt/scripts/__init__.pyo
%%PYTHON_SITELIBDIR%%/cutadapt/scripts/cutadapt.py
%%PYTHON_SITELIBDIR%%/cutadapt/scripts/cutadapt.pyc
%%PYTHON_SITELIBDIR%%/cutadapt/scripts/cutadapt.pyo
%%PYTHON_SITELIBDIR%%/cutadapt/seqio.py
%%PYTHON_SITELIBDIR%%/cutadapt/seqio.pyc
%%PYTHON_SITELIBDIR%%/cutadapt/seqio.pyo

2
databases/memcached/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= memcached
PORTVERSION= 1.5.9
PORTVERSION= 1.5.10
CATEGORIES= databases
MASTER_SITES= http://www.memcached.org/files/ \
GENTOO

6
databases/memcached/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1531155431
SHA256 (memcached-1.5.9.tar.gz) = 4af3577dbf71cb0a748096dc6562ccd587cddb7565c720f1fdb23e8a34241d06
SIZE (memcached-1.5.9.tar.gz) = 462605
TIMESTAMP = 1537478918
SHA256 (memcached-1.5.10.tar.gz) = 494c060dbd96d546c74ab85a3cc3984d009b4423767ac33e05dd2340c01f1c4b
SIZE (memcached-1.5.10.tar.gz) = 465169

2
databases/p5-Search-Xapian12/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Search-Xapian
PORTVERSION= 1.2.25.0
PORTVERSION= 1.2.25.2
CATEGORIES= databases perl5
MASTER_SITES= http://oligarchy.co.uk/xapian/${PORTVERSION:R}/ \
LOCAL/sunpoet \

6
databases/p5-Search-Xapian12/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1506515429
SHA256 (Search-Xapian-1.2.25.0.tar.gz) = 5e5b5968c4001e89d72f93c8a118fa0840c888401ff62acc440ec76be32481d4
SIZE (Search-Xapian-1.2.25.0.tar.gz) = 72097
TIMESTAMP = 1537451473
SHA256 (Search-Xapian-1.2.25.2.tar.gz) = 24955a284279fdbc5a324a5b73b09585ae506932be19a7105e114834e243ea42
SIZE (Search-Xapian-1.2.25.2.tar.gz) = 72424

4
databases/py-sqlalchemy12/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= sqlalchemy
PORTVERSION= 1.2.11
PORTVERSION= 1.2.12
CATEGORIES= databases python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -25,8 +25,8 @@ OPTIONS_MULTI= BACKEND
OPTIONS_MULTI_BACKEND= MSSQL MYSQL PGSQL SQLITE SYBASE
OPTIONS_DEFAULT=SQLITE
USE_PYTHON= autoplist concurrent distutils
USES= python
USE_PYTHON= autoplist concurrent distutils
PORTDOCS= *
PORTEXAMPLES= *

6
databases/py-sqlalchemy12/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1534865874
SHA256 (SQLAlchemy-1.2.11.tar.gz) = ef6569ad403520ee13e180e1bfd6ed71a0254192a934ec1dbd3dbf48f4aa9524
SIZE (SQLAlchemy-1.2.11.tar.gz) = 5611782
TIMESTAMP = 1537456530
SHA256 (SQLAlchemy-1.2.12.tar.gz) = c5951d9ef1d5404ed04bae5a16b60a0779087378928f997a294d1229c6ca4d3e
SIZE (SQLAlchemy-1.2.12.tar.gz) = 5634807

2
databases/tcl-sqlite3/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= sqlite3
PORTVERSION= 3.25.0
PORTVERSION= 3.25.1
CATEGORIES= databases tcl
MASTER_SITES= https://www.sqlite.org/2018/ http://www2.sqlite.org/2018/ http://www3.sqlite.org/2018/
PKGNAMEPREFIX= tcl-

6
databases/tcl-sqlite3/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1537278314
SHA256 (sqlite-autoconf-3250000.tar.gz) = de1a93dfc1ea23d93ee85440fe4347d0b9cd936f25c29645ee0ee170d1307f71
SIZE (sqlite-autoconf-3250000.tar.gz) = 2763727
TIMESTAMP = 1537457415
SHA256 (sqlite-autoconf-3250100.tar.gz) = 96ed46bd87f093073ca8afd613020def847009b611c89f397bc24bd932ec6fd1
SIZE (sqlite-autoconf-3250100.tar.gz) = 2763831

2
devel/Makefile
View file

@ -4851,6 +4851,7 @@
SUBDIR += py-pooch
SUBDIR += py-positional
SUBDIR += py-posix_ipc
SUBDIR += py-poyo
SUBDIR += py-pp
SUBDIR += py-pqueue
SUBDIR += py-pretend
@ -6332,6 +6333,7 @@
SUBDIR += xtoolchain-llvm40
SUBDIR += xtoolchain-llvm50
SUBDIR += xtoolchain-llvm60
SUBDIR += xtoolchain-llvm70
SUBDIR += xwpe
SUBDIR += xxgdb
SUBDIR += xxhash

1
devel/gitaly/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= gitaly
DISTVERSION= 0.117.2
PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= mfechner@FreeBSD.org

5
devel/p5-Data-Dumper/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Data-Dumper
PORTVERSION= 2.161
PORTVERSION= 2.172
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@ -16,4 +16,7 @@ LICENSE_COMB= dual
USES= perl5
USE_PERL5= configure
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Data/Dumper/Dumper.so
.include <bsd.port.mk>

6
devel/p5-Data-Dumper/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1468513009
SHA256 (Data-Dumper-2.161.tar.gz) = 3aa4ac1b042b3880438165fb2b2139d377564a8e9928ffe689ede5304ee90558
SIZE (Data-Dumper-2.161.tar.gz) = 107198
TIMESTAMP = 1537456704
SHA256 (Data-Dumper-2.172.tar.gz) = a95a3037163817221021ac145500968be44dc155c261f4097136392c0a9fecd9
SIZE (Data-Dumper-2.172.tar.gz) = 110199

1
devel/p5-Data-Dumper/pkg-plist
View file

@ -1,2 +1,3 @@
%%SITE_ARCH%%/Data/Dumper.pm
%%SITE_ARCH%%/auto/Data/Dumper/Dumper.so
%%PERL5_MAN3%%/Data::Dumper.3.gz

2
devel/p5-Date-Manip/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Date-Manip
PORTVERSION= 6.72
PORTVERSION= 6.73
CATEGORIES= devel perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:SBECK

6
devel/p5-Date-Manip/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1529432472
SHA256 (Date-Manip-6.72.tar.gz) = 38f4dd9d94b41092ca7b9da2ef72c3bb8b8c8bff6da14d785c612f3cc7a94da6
SIZE (Date-Manip-6.72.tar.gz) = 1853750
TIMESTAMP = 1537479955
SHA256 (Date-Manip-6.73.tar.gz) = d39295c7c3f19b43470d1203dded8cb649b41a1098e51b5b7c7cf17b662ca255
SIZE (Date-Manip-6.73.tar.gz) = 1853891

2
devel/p5-Devel-PPPort/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Devel-PPPort
PORTVERSION= 3.42
PORTVERSION= 3.43
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-

6
devel/p5-Devel-PPPort/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1524379455
SHA256 (Devel-PPPort-3.42.tar.gz) = bac5d98b92fe2673a84ea45f1c9b615e3a46c3cc6db59c61a2fc95dd3cf9e14a
SIZE (Devel-PPPort-3.42.tar.gz) = 222115
TIMESTAMP = 1537456727
SHA256 (Devel-PPPort-3.43.tar.gz) = 90fd98fb24e1d7252011ff181244e04c8c8135933e67eab93c57ed6a61ed86f4
SIZE (Devel-PPPort-3.43.tar.gz) = 225129

11
devel/p5-Inline-CPP/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Inline-CPP
PORTVERSION= 0.74
PORTVERSION= 0.75
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@ -12,14 +12,15 @@ COMMENT= Write Perl subroutines and classes in C++
LICENSE= ART10
BUILD_DEPENDS= p5-Inline>=0.78:devel/p5-Inline \
BUILD_DEPENDS= p5-ExtUtils-CppGuess>=0.11:devel/p5-ExtUtils-CppGuess \
${RUN_DEPENDS}
RUN_DEPENDS= p5-Inline>=0.78:devel/p5-Inline \
p5-Inline-C>=0.67:devel/p5-Inline-C \
p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
RUN_DEPENDS:= ${BUILD_DEPENDS}
BUILD_DEPENDS+= p5-ExtUtils-CppGuess>=0.11:devel/p5-ExtUtils-CppGuess
NO_ARCH= yes
USES= perl5
USE_PERL5= configure
NO_ARCH= yes
.include <bsd.port.mk>

5
devel/p5-Inline-CPP/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (Inline-CPP-0.74.tar.gz) = 2f2fda43d760cf398ee07d5d0ac1f60c7880ea48e544136f6ecd663783fe8858
SIZE (Inline-CPP-0.74.tar.gz) = 63298
TIMESTAMP = 1537366615
SHA256 (Inline-CPP-0.75.tar.gz) = 664b400139ae042853133c84fd435485dc9a29b3a93eaab49e981e2e8842a37c
SIZE (Inline-CPP-0.75.tar.gz) = 63924

12
devel/p5-Inline-CPP/files/patch-Makefile.PL
View file

@ -1,15 +1,15 @@
--- Makefile.PL.orig 2015-09-10 19:21:06 UTC
--- Makefile.PL.orig 2018-09-18 22:19:47 UTC
+++ Makefile.PL
@@ -37,10 +37,10 @@ check_prereqs( \%PREREQ_PM ) or warn "!!
my( $cc_guess, $libs_guess ) = guess_compiler();
@@ -37,10 +37,10 @@ check_prereqs(\%PREREQ_PM) or warn "!!!
my($cc_guess, $libs_guess) = guess_compiler();
my $cpp_compiler
- = prompt( "What C++ compiler would you like to use?", $cc_guess );
- = prompt("What C++ compiler would you like to use?", $cc_guess);
+ = $cc_guess;
my $libs
- = prompt( "What default libraries would you like to include?", $libs_guess );
- = prompt("What default libraries would you like to include?", $libs_guess);
+ = $libs_guess;
configure_distribution( $test_cpp_filename, $cpp_compiler, $libs );
configure_distribution($test_cpp_filename, $cpp_compiler, $libs);

26
devel/py-poyo/Makefile Normal file
View file

@ -0,0 +1,26 @@
# $FreeBSD$
PORTNAME= poyo
PORTVERSION= 0.4.1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= matthew@FreeBSD.org
COMMENT= Lightweight YAML Parser
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
do-test:
@cd ${WRKSRC} && ${LOCALBASE}/bin/tox-${PYTHON_VER}
.include <bsd.port.mk>

3
devel/py-poyo/distinfo Normal file
View file

@ -0,0 +1,3 @@
TIMESTAMP = 1537447352
SHA256 (poyo-0.4.1.tar.gz) = 103b4ee3e1c7765098fe1cabe43f828db2e2a6079646561a2117e1a809f352d6
SIZE (poyo-0.4.1.tar.gz) = 10960

8
devel/py-poyo/pkg-descr Normal file
View file

@ -0,0 +1,8 @@
A lightweight YAML Parser for Python
Please note that Poyo supports only a chosen subset of the YAML
format.
It can only read but not write and is not compatible with JSON.
WWW: https://pypi.org/project/poyo/

2
devel/py-robotframework-databaselibrary/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= robotframework-databaselibrary
PORTVERSION= 1.0.1
PORTVERSION= 1.1.1
DISTVERSIONPREFIX= v
CATEGORIES= devel www python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

6
devel/py-robotframework-databaselibrary/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1494513030
SHA256 (franz-see-Robotframework-Database-Library-v1.0.1_GH0.tar.gz) = 470d2d4268ca667a5890d49901286656f53747cda4dfd30153d66d98b9e0dc15
SIZE (franz-see-Robotframework-Database-Library-v1.0.1_GH0.tar.gz) = 260134
TIMESTAMP = 1537475046
SHA256 (franz-see-Robotframework-Database-Library-v1.1.1_GH0.tar.gz) = 60de69973cec2a7231341e02c568349ea62948d5b03837a55ee953c1bbba98dc
SIZE (franz-see-Robotframework-Database-Library-v1.1.1_GH0.tar.gz) = 288257

2
devel/rubygem-aws-sdk-core/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aws-sdk-core
DISTVERSION= 2.11.131
DISTVERSION= 2.11.132
CATEGORIES= devel rubygems
MASTER_SITES= RG

6
devel/rubygem-aws-sdk-core/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1537366508
SHA256 (rubygem/aws-sdk-core-2.11.131.gem) = e5ac85b7b7fea46c17c8176d284a94cfaa9ffb1c3d1c179aa75b524785a2440b
SIZE (rubygem/aws-sdk-core-2.11.131.gem) = 1356800
TIMESTAMP = 1537456616
SHA256 (rubygem/aws-sdk-core-2.11.132.gem) = 0359723843a9080ddc013956c7daf85c0551e53495bed41fb83a0581a1b84149
SIZE (rubygem/aws-sdk-core-2.11.132.gem) = 1357312

2
devel/rubygem-aws-sdk-resources/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aws-sdk-resources
DISTVERSION= 2.11.131
DISTVERSION= 2.11.132
CATEGORIES= devel rubygems
MASTER_SITES= RG

6
devel/rubygem-aws-sdk-resources/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1537366524
SHA256 (rubygem/aws-sdk-resources-2.11.131.gem) = be6e51fe433ad12f13608f2a3c78f7817f8a63e6094c0a8072ab3e1f209ff34a
SIZE (rubygem/aws-sdk-resources-2.11.131.gem) = 48640
TIMESTAMP = 1537456629
SHA256 (rubygem/aws-sdk-resources-2.11.132.gem) = 0526ed8409394331f8eb31da18603655b7c51b17f79c6228fa885144667375e5
SIZE (rubygem/aws-sdk-resources-2.11.132.gem) = 48640

2
devel/rubygem-aws-sdk/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aws-sdk
DISTVERSION= 2.11.131
DISTVERSION= 2.11.132
CATEGORIES= devel rubygems
MASTER_SITES= RG

6
devel/rubygem-aws-sdk/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1537366536
SHA256 (rubygem/aws-sdk-2.11.131.gem) = 05d7b175859ffe6dea17cf5a1854686d21c2551bae90256a7270d9f731ae3918
SIZE (rubygem/aws-sdk-2.11.131.gem) = 4608
TIMESTAMP = 1537456641
SHA256 (rubygem/aws-sdk-2.11.132.gem) = bf937e1c46eb2d01f49285671f07a2fbc405543dec0929b5bebfa8498be4b564
SIZE (rubygem/aws-sdk-2.11.132.gem) = 4608

7
devel/xtoolchain-llvm70/Makefile Normal file
View file

@ -0,0 +1,7 @@
# $FreeBSD$
LLVM_SUFFIX=70
MASTERDIR= ${.CURDIR}/../xtoolchain-llvm-devel
.include "${MASTERDIR}/Makefile"

10
dns/bind911/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= bind
PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
PORTREVISION= 2
PORTREVISION= 0
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
PKGNAMESUFFIX= 911
@ -22,7 +22,7 @@ USE_HARDENING= safestack
USES= cpe libedit
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
ISCVERSION= 9.11.4-P1
ISCVERSION= 9.11.4-P2
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
@ -151,9 +151,9 @@ GSSAPI_MIT_USES= gssapi:mit
GSSAPI_NONE_CONFIGURE_ON= --without-gssapi
IDN_CONFIGURE_OFF= --without-idn
IDN_CONFIGURE_ON= --with-idn=${LOCALBASE} ${ICONV_CONFIGURE_BASE}
IDN_LIB_DEPENDS= libidnkit.so:dns/idnkit
IDN_CONFIGURE_OFF= --without-libidn2
IDN_CONFIGURE_ON= --with-libidn2=${LOCALBASE} ${ICONV_CONFIGURE_BASE}
IDN_LIB_DEPENDS= libidn2.so:dns/libidn2
IDN_USES= iconv
IPV6_CONFIGURE_ENABLE= ipv6

6
dns/bind911/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1533712466
SHA256 (bind-9.11.4-P1.tar.gz) = b0e0dc3c8bf26989b1cad53f90d44a48e39404afc68f65c45bae79b446f0fe23
SIZE (bind-9.11.4-P1.tar.gz) = 9623403
TIMESTAMP = 1537447447
SHA256 (bind-9.11.4-P2.tar.gz) = a85af7b629109d41285c7adeae1515daac638bbe4d5dc30d1f4b343dff09d811
SIZE (bind-9.11.4-P2.tar.gz) = 9617963

35
dns/bind913/Makefile
View file

@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
PORTREVISION= 0
.else
# dns/bind913 here
PORTREVISION= 2
PORTREVISION= 0
.endif
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
@ -35,7 +35,7 @@ USE_HARDENING= safestack
USES= cpe libedit ssl
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
ISCVERSION= 9.13.2
ISCVERSION= 9.13.3
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
@ -46,7 +46,6 @@ CPE_UPDATE= ${ISCVERSION:C/.*-//:tl}
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \
--disable-symtable \
--with-randomdev=/dev/random \
--with-libxml2=${LOCALBASE} \
--with-readline="-L${LOCALBASE}/lib -ledit" \
--with-dlopen=yes \
@ -69,13 +68,12 @@ PORTDOCS= *
MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFAULT= THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON
OPTIONS_DEFAULT= SIGCHASE IDN GSSAPI_NONE JSON PYTHON
OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \
FIXED_RRSET SIGCHASE IPV6 THREADS
FIXED_RRSET SIGCHASE IPV6
OPTIONS_RADIO= CRYPTO GOSTDEF
OPTIONS_RADIO= CRYPTO
OPTIONS_RADIO_CRYPTO= NATIVE_PKCS11
OPTIONS_RADIO_GOSTDEF= GOST GOST_ASN1
.if !defined(BIND_TOOLS_SLAVE)
OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN
@ -102,9 +100,6 @@ DLZ_STUB_DESC= DLZ stub driver
DNSTAP_DESC= Provides fast passive logging of DNS messages
FIXED_RRSET_DESC= Enable fixed rrset ordering
GEOIP_DESC= Allow geographically based ACL.
GOSTDEF_DESC= Enable GOST ciphers
GOST_ASN1_DESC= GOST using ASN.1
GOST_DESC= GOST raw keys (new default)
GSSAPI_BASE_DESC= Using Heimdal in base
GSSAPI_HEIMDAL_DESC= Using security/heimdal
GSSAPI_MIT_DESC= Using security/krb5
@ -132,7 +127,6 @@ DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes
DLZ_LDAP_USE= openldap=yes
DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes
DLZ_MYSQL_PREVENTS= THREADS
DLZ_MYSQL_USES= mysql
DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes
@ -141,7 +135,6 @@ DLZ_POSTGRESQL_USES= pgsql
DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes
DNSTAP_CONFIGURE_ENABLE= dnstap
DNSTAP_IMPLIES= THREADS
DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \
libprotobuf-c.so:devel/protobuf-c
@ -150,10 +143,6 @@ FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset
GEOIP_CONFIGURE_WITH= geoip
GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
GOST_ASN1_CONFIGURE_ON= --with-gost=asn1
GOST_CONFIGURE_ON= --with-gost
GSSAPI_BASE_CONFIGURE_ON=\
--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
GSSAPI_BASE_USES= gssapi
@ -186,7 +175,6 @@ LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb
MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl
NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11
NATIVE_PKCS11_IMPLIES= THREADS
PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR}
PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD}
@ -208,24 +196,11 @@ START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \
TCP_FASTOPEN_CONFIGURE_ENABLE= tcp-fastopen
THREADS_CONFIGURE_ENABLE= threads
TUNING_LARGE_IMPLIES= THREADS
TUNING_LARGE_CONFIGURE_ON= --with-tuning=large
TUNING_LARGE_CONFIGURE_OFF= --with-tuning=default
.include <bsd.port.pre.mk>
.if !${PORT_OPTIONS:MGOST} && !${PORT_OPTIONS:MGOST_ASN1}
CONFIGURE_ARGS+= --without-gost
.endif
.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && ${SSL_DEFAULT} == base
BROKEN= OpenSSL from the base system does not support GOST, add \
DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything \
that needs SSL.
.endif
post-patch:
.if defined(BIND_TOOLS_SLAVE)
@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \

6
dns/bind913/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1531290964
SHA256 (bind-9.13.2.tar.gz) = 6c044e9ea81add9dbbd2f5dfc224964cc6b6e364e43a8d6d8b574d9282651802
SIZE (bind-9.13.2.tar.gz) = 8547111
TIMESTAMP = 1537447591
SHA256 (bind-9.13.3.tar.gz) = 76674cf2a3e61766aed5c7fd1ee6ed3da133a9e331b35b24f40efdf1bbac5b44
SIZE (bind-9.13.3.tar.gz) = 7805551

28
dns/bind913/files/extrapatch-bind-min-override-ttl
View file

@ -1,6 +1,6 @@
--- bin/named/config.c.orig 2018-07-03 07:51:40 UTC
--- bin/named/config.c.orig 2018-09-06 00:15:26 UTC
+++ bin/named/config.c
@@ -177,12 +177,14 @@ options {\n\
@@ -174,12 +174,14 @@ options {\n\
max-recursion-queries 75;\n\
max-stale-ttl 604800; /* 1 week */\n\
message-compression yes;\n\
@ -15,9 +15,9 @@
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
--- bin/named/server.c.orig 2018-07-03 07:51:40 UTC
--- bin/named/server.c.orig 2018-09-06 00:15:26 UTC
+++ bin/named/server.c
@@ -4071,6 +4071,16 @@ configure_view(dns_view_t *view, dns_vie
@@ -4074,6 +4074,16 @@ configure_view(dns_view_t *view, dns_vie
}
obj = NULL;
@ -34,20 +34,20 @@
result = named_config_get(maps, "max-cache-ttl", &obj);
INSIST(result == ISC_R_SUCCESS);
view->maxcachettl = cfg_obj_asuint32(obj);
--- lib/dns/include/dns/view.h.orig 2018-07-03 07:51:40 UTC
--- lib/dns/include/dns/view.h.orig 2018-09-06 00:15:26 UTC
+++ lib/dns/include/dns/view.h
@@ -151,6 +151,8 @@ struct dns_view {
isc_boolean_t requestnsid;
isc_boolean_t sendcookie;
@@ -153,6 +153,8 @@ struct dns_view {
bool requestnsid;
bool sendcookie;
dns_ttl_t maxcachettl;
+ dns_ttl_t mincachettl;
+ dns_ttl_t overridecachettl;
dns_ttl_t maxncachettl;
isc_uint32_t nta_lifetime;
isc_uint32_t nta_recheck;
--- lib/dns/resolver.c.orig 2018-07-03 07:51:40 UTC
uint32_t nta_lifetime;
uint32_t nta_recheck;
--- lib/dns/resolver.c.orig 2018-09-06 00:15:26 UTC
+++ lib/dns/resolver.c
@@ -5799,6 +5799,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
@@ -5758,6 +5758,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
}
/*
@ -66,9 +66,9 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
--- lib/isccfg/namedconf.c.orig 2018-07-03 07:51:40 UTC
--- lib/isccfg/namedconf.c.orig 2018-09-06 00:15:26 UTC
+++ lib/isccfg/namedconf.c
@@ -1917,6 +1917,8 @@ view_clauses[] = {
@@ -1919,6 +1919,8 @@ view_clauses[] = {
{ "max-acache-size", &cfg_type_sizenodefault,
CFG_CLAUSEFLAG_OBSOLETE },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 },

4
dns/bind913/files/patch-bin_named_include_named_globals.h
View file

@ -1,8 +1,8 @@
We reference the pid file as being run/named/pid everywere else.
--- bin/named/include/named/globals.h.orig 2018-05-18 05:44:02 UTC
--- bin/named/include/named/globals.h.orig 2018-09-06 00:15:26 UTC
+++ bin/named/include/named/globals.h
@@ -126,7 +126,7 @@ EXTERN isc_boolean_t named_g_forcelock
@@ -128,7 +128,7 @@ EXTERN bool named_g_forcelock INIT(fals
#if NAMED_RUN_PID_DIR
EXTERN const char * named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR
"/run/named/"

8
dns/bind913/files/patch-configure
View file

@ -1,6 +1,6 @@
--- configure.orig 2018-07-03 07:51:40 UTC
--- configure.orig 2018-09-06 00:15:26 UTC
+++ configure
@@ -14993,27 +14993,9 @@ done
@@ -16468,27 +16468,9 @@ done
# problems start to show up.
saved_libs="$LIBS"
for TRY_LIBS in \
@ -30,7 +30,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
$as_echo_n "checking linking as $TRY_LIBS... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15056,47 +15038,7 @@ $as_echo "no" >&6; } ;;
@@ -16531,47 +16513,7 @@ $as_echo "no" >&6; } ;;
no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
esac
@ -79,7 +79,7 @@
DNS_GSSAPI_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
@@ -23693,7 +23635,7 @@ $as_echo "" >&6; }
@@ -21337,7 +21279,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).

6
dns/bind913/pkg-plist
View file

@ -141,7 +141,6 @@ include/isc/backtrace.h
include/isc/base32.h
include/isc/base64.h
include/isc/bind9.h
include/isc/boolean.h
include/isc/buffer.h
include/isc/bufferlist.h
include/isc/commandline.h
@ -165,11 +164,9 @@ include/isc/hmacmd5.h
include/isc/hmacsha.h
include/isc/ht.h
include/isc/httpd.h
include/isc/int.h
include/isc/interfaceiter.h
include/isc/iterated_hash.h
include/isc/json.h
include/isc/keyboard.h
include/isc/lang.h
include/isc/lex.h
include/isc/lfsr.h
@ -219,9 +216,8 @@ include/isc/socket.h
include/isc/stat.h
include/isc/stats.h
include/isc/stdio.h
include/isc/stdlib.h
include/isc/stdtime.h
include/isc/strerror.h
include/isc/strerr.h
include/isc/string.h
include/isc/symtab.h
include/isc/syslog.h

67
emulators/dolphin-emu/Makefile
View file

@ -2,55 +2,67 @@
# $FreeBSD$
PORTNAME= dolphin-emu
PORTVERSION= 5.0
PORTREVISION= 26
PORTVERSION= 5.0.8715
CATEGORIES= emulators
MAINTAINER= martymac@FreeBSD.org
COMMENT= Gamecube and Wii Emulator
LICENSE= GPLv2
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/license.txt
BROKEN_FreeBSD_10= conflicting types for '__hash_table<_Tp, _Hash, _Equal, _Alloc>'
# Notes on dependencies:
# - keep enet from Externals as Dolphin's version diverges
# - xxhash and SOIL are not (yet?) in ports and built from Externals
# - skip ALSA (emulated), ao (buggy) and bluez support
# - alsa support disabled (not optimal)
# - enet and soundtouch come from Externals/ as Dolphin's versions diverge
# (see comments in CMakeLists.txt)
# Various problems that may be addressed in the future:
# - xxhash comes from Externals/ as it cannot be properly detected yet
# - gtest detection is missing (Externals/ version enforced by CMakeLists.txt)
# - cubeb comes from Externals/ as it is not available from ports yet
# - sdl2 support is buggy and leads to an infinite wait when Dolphin starts:
# ciface::SDL::PopulateDevices () at Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp:177
LIB_DEPENDS= libpulse.so:audio/pulseaudio \
libavcodec.so:multimedia/ffmpeg \
libavdevice.so:multimedia/ffmpeg \
libavfilter.so:multimedia/ffmpeg \
libavformat.so:multimedia/ffmpeg \
libswscale.so:multimedia/ffmpeg \
libavutil.so:multimedia/ffmpeg \
libportaudio.so:audio/portaudio \
libswresample.so:multimedia/ffmpeg \
libswscale.so:multimedia/ffmpeg \
libpugixml.so:textproc/pugixml \
liblzo2.so:archivers/lzo2 \
libpng.so:graphics/png \
libSoundTouch.so:audio/soundtouch \
libjack.so:audio/jack \
libsndio.so:audio/sndio \
libsfml-system.so:devel/sfml \
libminiupnpc.so:net/miniupnpc \
libmbedtls.so:security/mbedtls \
libcurl.so:ftp/curl \
libgtest.so:devel/googletest
libhidapi.so:comms/hidapi
LLD_UNSAFE= yes
USES= cmake compiler:c++11-lib gnome iconv openal pkgconfig
USES= cmake compiler:c++11-lib desktop-file-utils iconv pkgconfig \
qmake qt:5
USE_GITHUB= yes
GH_PROJECT= dolphin
GH_TAGNAME= 5f0d825
USE_GL= gl glew glu
USE_GNOME= atk cairo glib20 gdkpixbuf2 gtk20 pango
USE_SDL= sdl2
USE_WX= 3.0+
USE_XORG= ice sm x11 xext xi xrandr
USE_QT= buildtools_build core gui widgets
CMAKE_ARGS+= -DTRY_X11:BOOL=ON \
-DUSE_UPNP:BOOL=ON \
-DDISABLE_WX:BOOL=OFF \
-DUSE_SHARED_GTEST:BOOL=ON \
-DENABLE_PCH:BOOL=OFF \
-DENABLE_QT:BOOL=ON \
-DENABLE_ALSA:BOOL=OFF \
-DENABLE_PULSEAUDIO:BOOL=ON \
-DUSE_DISCORD_PRESENCE:BOOL=OFF \
-DENABLE_SDL:BOOL=OFF \
-DCMAKE_REQUIRED_INCLUDES:PATH="${LOCALBASE}/include" \
-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON
-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib"
MAKE_ENV+= DESTDIR="${STAGEDIR}"
# XXX Bypass git check (and set a dummy -unused- revision)
CMAKE_ARGS+= -DDOLPHIN_WC_BRANCH:STRING="stable" \
@ -64,20 +76,9 @@ NLS_CMAKE_OFF= -DDISABLE_NLS:BOOL=ON
.include <bsd.port.pre.mk>
# JIT-enabled binaries are amd64 only
.if ${ARCH} != "amd64"
# JIT-enabled binaries are amd64 and aarch64 only
.if ${ARCH} != "amd64" && ${ARCH} != "aarch64"
CMAKE_ARGS+= -DENABLE_GENERIC:BOOL=ON
.endif
# When building with GCC, needs GCC 4.9+
.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 49
USE_GCC= yes
# Enable std::stoul()
CXXFLAGS+= -D_GLIBCXX_USE_C99
# Enable log2f(), exp2f() and roundf()
CXXFLAGS+= -D_GLIBCXX_USE_C99_MATH_TR1
# Turn on extra long double versions of math functions, needed for cmath
CXXFLAGS+= -D__ISO_C_VISIBLE=1999 -D_DECLARE_C99_LDBL_MATH
.endif
.include <bsd.port.post.mk>

6
emulators/dolphin-emu/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1480489891
SHA256 (dolphin-emu-dolphin-5.0_GH0.tar.gz) = 62c4602055767ab314ff50a3b94ea57f792832aa1629e6b1117ebce10518dc0b
SIZE (dolphin-emu-dolphin-5.0_GH0.tar.gz) = 38246344
TIMESTAMP = 1536610912
SHA256 (dolphin-emu-dolphin-5.0.8715-5f0d825_GH0.tar.gz) = d9cfc6b3ab5aeccfae8e78569580621c6a959291fea8c5e62dee7b0ca9c60cbd
SIZE (dolphin-emu-dolphin-5.0.8715-5f0d825_GH0.tar.gz) = 36775798

11
emulators/dolphin-emu/files/patch-CMakeLists.txt Normal file
View file

@ -0,0 +1,11 @@
--- CMakeLists.txt.orig 2018-09-17 22:39:14.470717000 +0200
+++ CMakeLists.txt 2018-09-17 22:39:47.456106000 +0200
@@ -92,7 +92,7 @@
set(mandir ${CMAKE_INSTALL_PREFIX}/documentation/man CACHE PATH "mandir")
else()
set(datadir ${CMAKE_INSTALL_PREFIX}/share/dolphin-emu CACHE PATH "datadir")
- set(mandir ${CMAKE_INSTALL_PREFIX}/share/man CACHE PATH "mandir")
+ set(mandir ${CMAKE_INSTALL_PREFIX}/man CACHE PATH "mandir")
endif()
add_definitions(-DDATA_DIR="${datadir}/")

13
emulators/dolphin-emu/files/patch-Source-Core-Common-CMakeLists.txt
View file

@ -1,13 +0,0 @@
Link to OpenGL libraries earlier to avoid crash with Nvidia's libGL
--- Source/Core/Common/CMakeLists.txt.orig 2016-06-24 08:09:07.000000000 +0000
+++ Source/Core/Common/CMakeLists.txt 2017-01-12 20:59:59.578506000 +0000
@@ -88,7 +88,7 @@
set(SRCS ${SRCS} GL/GLInterface/GLX.cpp)
# GLX has a hard dependency on libGL.
# Make sure to link to it if using GLX.
- set(LIBS ${LIBS} ${OPENGL_LIBRARIES})
+ set(LIBS ${OPENGL_LIBRARIES} ${LIBS})
endif()
set(SRCS ${SRCS} GL/GLInterface/X11_Util.cpp)
set(LIBS ${LIBS} ${XRANDR_LIBRARIES})

12
emulators/dolphin-emu/files/patch-Source-Core-Core-MemoryWatcher.cpp
View file

@ -1,12 +0,0 @@
Add missing header for memset() and strncpy()
--- Source/Core/Core/MemoryWatcher.cpp.orig 2016-12-02 06:09:55.416128767 +0000
+++ Source/Core/Core/MemoryWatcher.cpp 2016-12-02 06:10:39.359433048 +0000
@@ -2,6 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
+#include <cstring>
#include <fstream>
#include <iostream>
#include <memory>

74
emulators/dolphin-emu/files/patch-Source-Core-DolphinQt-CMakeLists.txt Normal file
View file

@ -0,0 +1,74 @@
Add DISABLE_NLS option
--- Source/Core/DolphinQt/CMakeLists.txt.orig 2018-09-17 22:03:07.626843000 +0200
+++ Source/Core/DolphinQt/CMakeLists.txt 2018-09-17 22:04:54.938302000 +0200
@@ -148,36 +148,39 @@
endif()
# Handle localization
-find_package(Gettext)
-if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE)
- set(pot_file "${CMAKE_SOURCE_DIR}/Languages/po/dolphin-emu.pot")
- file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po)
-
- target_sources(dolphin-emu PRIVATE ${pot_file} ${LINGUAS})
- source_group("Localization" FILES ${LINGUAS})
- source_group("Localization\\\\Generated" FILES ${pot_file})
-
- foreach(po ${LINGUAS})
- get_filename_component(lang ${po} NAME_WE)
- set(mo_dir ${CMAKE_CURRENT_BINARY_DIR}/${lang})
- set(mo ${mo_dir}/dolphin-emu.mo)
-
- target_sources(dolphin-emu PRIVATE ${mo})
- source_group("Localization\\\\Generated" FILES ${mo})
-
- if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
- set_source_files_properties(${mo} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/${lang}.lproj")
- else()
- install(FILES ${mo} DESTINATION share/locale/${lang}/LC_MESSAGES)
- endif()
-
- add_custom_command(OUTPUT ${mo}
- COMMAND cmake -E make_directory ${mo_dir}
- COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${po} ${pot_file}
- COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${mo} ${po}
- DEPENDS ${po}
- )
- endforeach()
+option(DISABLE_NLS "Disable native language support (NLS)" OFF)
+if(NOT DISABLE_NLS)
+ find_package(Gettext)
+ if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE)
+ set(pot_file "${CMAKE_SOURCE_DIR}/Languages/po/dolphin-emu.pot")
+ file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po)
+
+ target_sources(dolphin-emu PRIVATE ${pot_file} ${LINGUAS})
+ source_group("Localization" FILES ${LINGUAS})
+ source_group("Localization\\\\Generated" FILES ${pot_file})
+
+ foreach(po ${LINGUAS})
+ get_filename_component(lang ${po} NAME_WE)
+ set(mo_dir ${CMAKE_CURRENT_BINARY_DIR}/${lang})
+ set(mo ${mo_dir}/dolphin-emu.mo)
+
+ target_sources(dolphin-emu PRIVATE ${mo})
+ source_group("Localization\\\\Generated" FILES ${mo})
+
+ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+ set_source_files_properties(${mo} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/${lang}.lproj")
+ else()
+ install(FILES ${mo} DESTINATION share/locale/${lang}/LC_MESSAGES)
+ endif()
+
+ add_custom_command(OUTPUT ${mo}
+ COMMAND cmake -E make_directory ${mo_dir}
+ COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${po} ${pot_file}
+ COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${mo} ${po}
+ DEPENDS ${po}
+ )
+ endforeach()
+ endif()
endif()
if(APPLE)

24
emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt
View file

@ -1,24 +0,0 @@
Add DISABLE_NLS option
--- Source/Core/DolphinWX/CMakeLists.txt.orig 2015-10-06 20:47:47.480759056 +0000
+++ Source/Core/DolphinWX/CMakeLists.txt 2015-10-06 20:49:16.636752942 +0000
@@ -101,11 +101,14 @@
set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE})
-include(FindGettext)
-if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND wxWidgets_FOUND)
- file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po)
- add_custom_target(translations ALL)
- GETTEXT_CREATE_TRANSLATIONS(${CMAKE_SOURCE_DIR}/Languages/po/dolphin-emu.pot ${LINGUAS})
+option(DISABLE_NLS "Disable native language support (NLS)" OFF)
+if(NOT DISABLE_NLS)
+ include(FindGettext)
+ if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND wxWidgets_FOUND)
+ file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po)
+ add_custom_target(translations ALL)
+ GETTEXT_CREATE_TRANSLATIONS(${CMAKE_SOURCE_DIR}/Languages/po/dolphin-emu.pot ${LINGUAS})
+ endif()
endif()
if(ANDROID)

33
emulators/dolphin-emu/files/patch-Source-Core-InputCommon-GCAdapter.cpp
View file

@ -1,33 +0,0 @@
commit c5b3b52d553d
Author: Jeffrey Pfau <jeffrey@endrift.com>
Date: Mon Dec 26 22:50:36 2016 -0800
InputCommon: Fix FreeBSD 11 libusb incompatibilities
---
Source/Core/InputCommon/GCAdapter.cpp | 6 ++++++
1 file changed, 6 insertions(+)
--- Source/Core/InputCommon/GCAdapter.cpp.orig 2016-06-24 08:09:07 UTC
+++ Source/Core/InputCommon/GCAdapter.cpp
@@ -49,7 +49,11 @@ static std::function<void(void)> s_detect_callback;
static bool s_libusb_driver_not_supported = false;
static libusb_context* s_libusb_context = nullptr;
+#if defined(__FreeBSD__) && __FreeBSD__ >= 11
+static bool s_libusb_hotplug_enabled = true;
+#else
static bool s_libusb_hotplug_enabled = false;
+#endif
#if defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102
static libusb_hotplug_callback_handle s_hotplug_handle;
#endif
@@ -102,7 +106,9 @@ static void ScanThreadFunc()
NOTICE_LOG(SERIALINTERFACE, "GC Adapter scanning thread started");
#if defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102
+#ifndef __FreeBSD__
s_libusb_hotplug_enabled = libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG) != 0;
+#endif
if (s_libusb_hotplug_enabled)
{
if (libusb_hotplug_register_callback(s_libusb_context, (libusb_hotplug_event)(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT), LIBUSB_HOTPLUG_ENUMERATE, 0x057e, 0x0337, LIBUSB_HOTPLUG_MATCH_ANY, HotplugCallback, nullptr, &s_hotplug_handle) != LIBUSB_SUCCESS)

12
emulators/dolphin-emu/files/patch-Source-Core-VideoCommon-ImageWrite.cpp
View file

@ -1,12 +0,0 @@
Add missing header for errno
--- Source/Core/VideoCommon/ImageWrite.cpp.orig 2016-12-01 14:49:37.182934391 +0000
+++ Source/Core/VideoCommon/ImageWrite.cpp 2016-12-01 14:51:32.373069616 +0000
@@ -2,6 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
+#include <cerrno>
#include <list>
#include <string>

12
emulators/dolphin-emu/files/patch-Source-Core-VideoCommon-TextureDecoder_Generic.cpp
View file

@ -1,12 +0,0 @@
Add missing header for memset()
--- Source/Core/VideoCommon/TextureDecoder_Generic.cpp.orig 2016-12-02 08:01:14.838668401 +0000
+++ Source/Core/VideoCommon/TextureDecoder_Generic.cpp 2016-12-02 08:01:28.081034936 +0000
@@ -4,6 +4,7 @@
#include <algorithm>
#include <cmath>
+#include <cstring>
#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"

905
emulators/dolphin-emu/pkg-plist
View file

File diff suppressed because it is too large Load diff

2
games/angband/Makefile
View file

@ -6,7 +6,7 @@ PORTVERSION= 4.1.3
CATEGORIES= games
MASTER_SITES= http://rephial.org/downloads/${PORTVERSION:R}/
MAINTAINER= ports@FreeBSD.org
MAINTAINER= andrew@merenbach.com
COMMENT= Rogue-like game with color, X11 support
LICENSE= GPLv2

2
graphics/fig2sxd/pkg-descr
View file

@ -1,3 +1,3 @@
A command line utility to convert .xfig files to the OpenOffice Draw format.
WWW: http://fig2sxd.sourceforge.net/
WWW: https://gitlab.com/acfbuerger/fig2sxd

1
graphics/libosmesa/Makefile
View file

@ -16,6 +16,7 @@ USE_XORG= xorgproto
CONFIGURE_ARGS+= --disable-dri --disable-egl --disable-gbm \
--disable-gles2 --with-gallium-drivers=swrast
MESA_BUILD_WRKSRC= src/util src/compiler src/mapi src/mesa
LDFLAGS_i386= -Wl,-znotext
.if "${MESA_LLVM_VER}" != ""
CONFIGURE_ARGS+= --enable-osmesa-gallium

1
graphics/mesa-dri/Makefile
View file

@ -66,6 +66,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-src_gallium_drivers_vc4_Makefile.in
BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
.endif
LDFLAGS_i386= -Wl,-znotext
.if ${DRI_DRIVERS} || ${VULKAN_DRIVERS:MINTEL}
. if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
# --build-id isn't supported by old GNU ld.bfd in base

8
graphics/p5-Image-PNG-Libpng/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= Image-PNG-Libpng
DISTVERSION= 0.45
DISTVERSION= 0.46
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@ -14,11 +14,7 @@ LICENSE_COMB= dual
LIB_DEPENDS= libpng.so:graphics/png
USES= perl5
USES= localbase perl5
USE_PERL5= configure
post-patch:
${REINPLACE_CMD} -e 's|# *INC *=> *$$inc|INC => "-I${LOCALBASE}/include"|' \
${WRKSRC}/Makefile.PL
.include <bsd.port.mk>

6
graphics/p5-Image-PNG-Libpng/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1524547415
SHA256 (Image-PNG-Libpng-0.45.tar.gz) = 00424fbe28efe9978dc9c96877989be897a2e8ddb3132e63903c54ae0cb1c353
SIZE (Image-PNG-Libpng-0.45.tar.gz) = 220492
TIMESTAMP = 1537456754
SHA256 (Image-PNG-Libpng-0.46.tar.gz) = f3688a6590d0e515cec568119a03b864fcbf3e5da2379fe94498be8613871a8d
SIZE (Image-PNG-Libpng-0.46.tar.gz) = 218923

3
lang/rust/Makefile
View file

@ -159,8 +159,7 @@ post-patch:
# `.cargo-checksum.json` to reflect the new checksums verified by Cargo.
@for dir in "${WRKSRC}/src/vendor/libc" \
"${WRKSRC}/src/vendor/libgit2-sys" \
"${WRKSRC}/src/vendor/openssl" \
"${WRKSRC}/src/vendor/openssl-sys"; do \
"${WRKSRC}/src/vendor/openssl"; do \
if ! test -d "$$dir"; then \
continue; \
fi; \

6
lang/rust/files/patch-src_vendor_openssl-sys_.cargo-checksum.json Normal file
View file

@ -0,0 +1,6 @@
--- src/vendor/openssl-sys/.cargo-checksum.json.orig 2018-09-11 04:49:55 UTC
+++ src/vendor/openssl-sys/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","Cargo.toml":"15b9e9f5255d11898d5f373ba8ac750d567155b1c81fa903f02e97b18cea5f18","Cargo.toml.orig":"3ec9308dd6326a80e0e30c076dd778f42cb1f1f616e666e924a210554681dd97","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"15b264aba47e69aa522c8cb37b320a156f0c3a3a72393338818046eac8ef4c3a","build/cfgs.rs":"b853b4100ed5421e4f4d436c3bb067f33c2a0349ff64ee121390bf23e1b769d5","build/main.rs":"bbb6b8a9b43fa47dc985c84ab6a5e64d7b77ae60c54b3038b68a4cef1a6759ab","src/lib.rs":"008a98eb5da8cb154b8f59904a9524a0a9cb22818ec734696c52d7ece384ab97","src/libressl/mod.rs":"412020ed9f0cbbb500f3f4d7157d8b2fc4a86eab6f6ba3293ca6ffd7bd0ac4f6","src/libressl/v250.rs":"8e64255d67e9e684b6d76184f96cfb8dca34c7f241fdbc08a982a221644257ea","src/libressl/v251.rs":"e823b2b5b103a9a2b3c307893f6fc8ca4213104fe3829b32fa3ce879bbc1ada9","src/libressl/v273.rs":"01492f8c44438a82466eac1b827dbed3213f21f0b5f6425259a0131e9e036aeb","src/openssl/mod.rs":"b63d420700cb96626e7795a10000e178477af90db6d6830c70a66f6d2b4e64d2","src/openssl/v10x.rs":"6b53ce40257a5ff8326ec5f0d6a83807c728c243ad5bde34b9782cdf8f157a21","src/openssl/v110.rs":"0e670f6af0bfbdb635012a3667b599a2b7c468e55ef29b289ab288e01c795e02","src/openssl/v111.rs":"26e5ef4c4faa628d8cec33cf77fc3736f9d01334227429114e91920439b65876"},"package":"912f301a749394e1025d9dcddef6106ddee9252620e6d0a0e5f8d0681de9b129"}
\ No newline at end of file
+{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","Cargo.toml":"15b9e9f5255d11898d5f373ba8ac750d567155b1c81fa903f02e97b18cea5f18","Cargo.toml.orig":"3ec9308dd6326a80e0e30c076dd778f42cb1f1f616e666e924a210554681dd97","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"15b264aba47e69aa522c8cb37b320a156f0c3a3a72393338818046eac8ef4c3a","build/cfgs.rs":"499f32ddaa16e3771dca2b70f1d4f66f91491456ffb3e1954901abd57bc64e10","build/main.rs":"ee81a437b0f52292359394f22a576c988e50313c386cec66b478766a784c26e7","src/lib.rs":"d3cd894a42d59f3e3d19ef1a376f2287971b68227c3ce142b307c5c05e1b2840"},"package":"912f301a749394e1025d9dcddef6106ddee9252620e6d0a0e5f8d0681de9b129"}

13
lang/rust/files/patch-src_vendor_openssl-sys_build.rs
View file

@ -1,13 +0,0 @@
--- src/vendor/openssl-sys/build.rs.orig 2018-08-14 20:32:17 UTC
+++ src/vendor/openssl-sys/build.rs
@@ -323,9 +323,7 @@ fn validate_headers(include_dirs: &[PathBuf]) -> Versi
#include <openssl/opensslv.h>
#include <openssl/opensslconf.h>
-#if LIBRESSL_VERSION_NUMBER >= 0x20800000
-RUST_LIBRESSL_NEW
-#elif LIBRESSL_VERSION_NUMBER >= 0x20700000
+#if LIBRESSL_VERSION_NUMBER >= 0x20700000
RUST_LIBRESSL_27X
#elif LIBRESSL_VERSION_NUMBER >= 0x20603000
RUST_LIBRESSL_26X

22
lang/rust/files/patch-src_vendor_openssl-sys_build_cfgs.rs Normal file
View file

@ -0,0 +1,22 @@
--- src/vendor/openssl-sys/build/cfgs.rs.orig 2018-09-11 04:49:55 UTC
+++ src/vendor/openssl-sys/build/cfgs.rs
@@ -16,6 +16,9 @@ pub fn get(openssl_version: Option<u64>, libressl_vers
if libressl_version >= 0x2_07_03_00_0 {
cfgs.push("libressl273");
}
+ if libressl_version >= 0x2_08_00_00_0 {
+ cfgs.push("libressl280");
+ }
} else {
let openssl_version = openssl_version.unwrap();
@@ -24,6 +27,9 @@ pub fn get(openssl_version: Option<u64>, libressl_vers
}
if openssl_version >= 0x1_00_02_00_0 {
cfgs.push("ossl102");
+ }
+ if openssl_version >= 0x1_00_02_06_0 {
+ cfgs.push("ossl102f");
}
if openssl_version >= 0x1_00_02_08_0 {
cfgs.push("ossl102h");

10
lang/rust/files/patch-src_vendor_openssl-sys_build_main.rs Normal file
View file

@ -0,0 +1,10 @@
--- src/vendor/openssl-sys/build/main.rs.orig 2018-09-11 04:49:55 UTC
+++ src/vendor/openssl-sys/build/main.rs
@@ -497,6 +497,7 @@ See rust-openssl README for more information:
(6, 2) => ('6', '2'),
(6, _) => ('6', 'x'),
(7, _) => ('7', 'x'),
+ (8, 0) => ('8', 'x'),
_ => version_error(),
};

31
lang/rust/files/patch-src_vendor_openssl-sys_src_aes.rs Normal file
View file

@ -0,0 +1,31 @@
--- src/vendor/openssl-sys/src/aes.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/aes.rs
@@ -0,0 +1,28 @@
+use libc::*;
+
+pub const AES_ENCRYPT: c_int = 1;
+pub const AES_DECRYPT: c_int = 0;
+
+pub const AES_MAXNR: c_int = 14;
+pub const AES_BLOCK_SIZE: c_int = 16;
+
+#[repr(C)]
+pub struct AES_KEY {
+ // There is some business with AES_LONG which is there to ensure the values here are 32 bits
+ rd_key: [u32; 4 * (AES_MAXNR as usize + 1)],
+ rounds: c_int,
+}
+
+extern "C" {
+ pub fn AES_set_encrypt_key(userKey: *const c_uchar, bits: c_int, key: *mut AES_KEY) -> c_int;
+ pub fn AES_set_decrypt_key(userKey: *const c_uchar, bits: c_int, key: *mut AES_KEY) -> c_int;
+
+ pub fn AES_ige_encrypt(
+ in_: *const c_uchar,
+ out: *mut c_uchar,
+ length: size_t,
+ key: *const AES_KEY,
+ ivec: *mut c_uchar,
+ enc: c_int,
+ );
+}

64
lang/rust/files/patch-src_vendor_openssl-sys_src_asn1.rs Normal file
View file

@ -0,0 +1,64 @@
--- src/vendor/openssl-sys/src/asn1.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/asn1.rs
@@ -0,0 +1,61 @@
+use libc::*;
+
+use *;
+
+pub const V_ASN1_UTCTIME: c_int = 23;
+pub const V_ASN1_GENERALIZEDTIME: c_int = 24;
+
+pub const MBSTRING_FLAG: c_int = 0x1000;
+pub const MBSTRING_UTF8: c_int = MBSTRING_FLAG;
+pub const MBSTRING_ASC: c_int = MBSTRING_FLAG | 1;
+pub const MBSTRING_BMP: c_int = MBSTRING_FLAG | 2;
+pub const MBSTRING_UNIV: c_int = MBSTRING_FLAG | 4;
+
+#[repr(C)]
+pub struct ASN1_ENCODING {
+ pub enc: *mut c_uchar,
+ pub len: c_long,
+ pub modified: c_int,
+}
+
+extern "C" {
+ pub fn ASN1_OBJECT_free(x: *mut ASN1_OBJECT);
+}
+
+stack!(stack_st_ASN1_OBJECT);
+
+extern "C" {
+ pub fn ASN1_STRING_type_new(ty: c_int) -> *mut ASN1_STRING;
+ #[cfg(any(ossl110, libressl273))]
+ pub fn ASN1_STRING_get0_data(x: *const ASN1_STRING) -> *const c_uchar;
+ #[cfg(any(all(ossl101, not(ossl110)), libressl))]
+ pub fn ASN1_STRING_data(x: *mut ASN1_STRING) -> *mut c_uchar;
+
+ pub fn ASN1_BIT_STRING_free(x: *mut ASN1_BIT_STRING);
+
+ pub fn ASN1_STRING_free(x: *mut ASN1_STRING);
+ pub fn ASN1_STRING_length(x: *const ASN1_STRING) -> c_int;
+
+ pub fn ASN1_GENERALIZEDTIME_free(tm: *mut ASN1_GENERALIZEDTIME);
+ pub fn ASN1_GENERALIZEDTIME_print(b: *mut BIO, tm: *const ASN1_GENERALIZEDTIME) -> c_int;
+ pub fn ASN1_TIME_free(tm: *mut ASN1_TIME);
+ pub fn ASN1_TIME_print(b: *mut BIO, tm: *const ASN1_TIME) -> c_int;
+
+ pub fn ASN1_INTEGER_free(x: *mut ASN1_INTEGER);
+ pub fn ASN1_INTEGER_get(dest: *const ASN1_INTEGER) -> c_long;
+ pub fn ASN1_INTEGER_set(dest: *mut ASN1_INTEGER, value: c_long) -> c_int;
+ pub fn BN_to_ASN1_INTEGER(bn: *const BIGNUM, ai: *mut ASN1_INTEGER) -> *mut ASN1_INTEGER;
+ pub fn ASN1_INTEGER_to_BN(ai: *const ASN1_INTEGER, bn: *mut BIGNUM) -> *mut BIGNUM;
+}
+
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ extern "C" {
+ pub fn ASN1_STRING_to_UTF8(out: *mut *mut c_uchar, s: *const ASN1_STRING) -> c_int;
+ }
+ } else {
+ extern "C" {
+ pub fn ASN1_STRING_to_UTF8(out: *mut *mut c_uchar, s: *mut ASN1_STRING) -> c_int;
+ }
+ }
+}

153
lang/rust/files/patch-src_vendor_openssl-sys_src_bio.rs Normal file
View file

@ -0,0 +1,153 @@
--- src/vendor/openssl-sys/src/bio.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/bio.rs
@@ -0,0 +1,150 @@
+use libc::*;
+
+use *;
+
+pub const BIO_TYPE_NONE: c_int = 0;
+
+pub const BIO_CTRL_EOF: c_int = 2;
+pub const BIO_CTRL_INFO: c_int = 3;
+pub const BIO_CTRL_FLUSH: c_int = 11;
+pub const BIO_C_SET_BUF_MEM_EOF_RETURN: c_int = 130;
+
+extern "C" {
+ pub fn BIO_set_flags(b: *mut BIO, flags: c_int);
+ pub fn BIO_clear_flags(b: *mut BIO, flags: c_int);
+}
+
+pub unsafe fn BIO_set_retry_read(b: *mut BIO) {
+ BIO_set_flags(b, BIO_FLAGS_READ | BIO_FLAGS_SHOULD_RETRY)
+}
+
+pub unsafe fn BIO_set_retry_write(b: *mut BIO) {
+ BIO_set_flags(b, BIO_FLAGS_WRITE | BIO_FLAGS_SHOULD_RETRY)
+}
+
+pub unsafe fn BIO_clear_retry_flags(b: *mut BIO) {
+ BIO_clear_flags(b, BIO_FLAGS_RWS | BIO_FLAGS_SHOULD_RETRY)
+}
+
+pub const BIO_FLAGS_READ: c_int = 0x01;
+pub const BIO_FLAGS_WRITE: c_int = 0x02;
+pub const BIO_FLAGS_IO_SPECIAL: c_int = 0x04;
+pub const BIO_FLAGS_RWS: c_int = BIO_FLAGS_READ | BIO_FLAGS_WRITE | BIO_FLAGS_IO_SPECIAL;
+pub const BIO_FLAGS_SHOULD_RETRY: c_int = 0x08;
+
+pub type bio_info_cb =
+ Option<unsafe extern "C" fn(*mut BIO, c_int, *const c_char, c_int, c_long, c_long)>;
+
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ pub enum BIO_METHOD {}
+ } else {
+ #[repr(C)]
+ pub struct BIO_METHOD {
+ pub type_: c_int,
+ pub name: *const c_char,
+ pub bwrite: Option<unsafe extern "C" fn(*mut ::BIO, *const c_char, c_int) -> c_int>,
+ pub bread: Option<unsafe extern "C" fn(*mut ::BIO, *mut c_char, c_int) -> c_int>,
+ pub bputs: Option<unsafe extern "C" fn(*mut ::BIO, *const c_char) -> c_int>,
+ pub bgets: Option<unsafe extern "C" fn(*mut ::BIO, *mut c_char, c_int) -> c_int>,
+ pub ctrl: Option<unsafe extern "C" fn(*mut ::BIO, c_int, c_long, *mut c_void) -> c_long>,
+ pub create: Option<unsafe extern "C" fn(*mut ::BIO) -> c_int>,
+ pub destroy: Option<unsafe extern "C" fn(*mut ::BIO) -> c_int>,
+ pub callback_ctrl: Option<unsafe extern "C" fn(*mut ::BIO, c_int, ::bio_info_cb) -> c_long>,
+ }
+ }
+}
+
+pub unsafe fn BIO_get_mem_data(b: *mut BIO, pp: *mut *mut c_char) -> c_long {
+ BIO_ctrl(b, BIO_CTRL_INFO, 0, pp as *mut c_void)
+}
+
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ extern "C" {
+ pub fn BIO_s_file() -> *const BIO_METHOD;
+ pub fn BIO_new(type_: *const BIO_METHOD) -> *mut BIO;
+ }
+ } else {
+ extern "C" {
+ pub fn BIO_s_file() -> *mut BIO_METHOD;
+ pub fn BIO_new(type_: *mut BIO_METHOD) -> *mut BIO;
+ }
+ }
+}
+extern "C" {
+ pub fn BIO_new_fp(stream: *mut FILE, close_flag: c_int) -> *mut BIO;
+ #[cfg(any(ossl110, libressl273))]
+ pub fn BIO_set_data(a: *mut ::BIO, data: *mut c_void);
+ #[cfg(any(ossl110, libressl273))]
+ pub fn BIO_get_data(a: *mut ::BIO) -> *mut c_void;
+ #[cfg(any(ossl110, libressl273))]
+ pub fn BIO_set_init(a: *mut ::BIO, init: c_int);
+ pub fn BIO_write(b: *mut BIO, buf: *const c_void, len: c_int) -> c_int;
+ pub fn BIO_read(b: *mut BIO, buf: *mut c_void, len: c_int) -> c_int;
+ pub fn BIO_ctrl(b: *mut BIO, cmd: c_int, larg: c_long, parg: *mut c_void) -> c_long;
+ pub fn BIO_free_all(b: *mut BIO);
+}
+
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ extern "C" {
+ pub fn BIO_s_mem() -> *const BIO_METHOD;
+ }
+ } else {
+ extern "C" {
+ pub fn BIO_s_mem() -> *mut BIO_METHOD;
+ }
+ }
+}
+cfg_if! {
+ if #[cfg(any(ossl102, libressl280))] {
+ extern "C" {
+ pub fn BIO_new_mem_buf(buf: *const c_void, len: c_int) -> *mut BIO;
+ }
+ } else {
+ extern "C" {
+ pub fn BIO_new_mem_buf(buf: *mut c_void, len: c_int) -> *mut BIO;
+ }
+ }
+}
+
+extern "C" {
+ pub fn BIO_new_socket(sock: c_int, close_flag: c_int) -> *mut BIO;
+
+ #[cfg(any(ossl110, libressl273))]
+ pub fn BIO_meth_new(type_: c_int, name: *const c_char) -> *mut BIO_METHOD;
+ #[cfg(any(ossl110, libressl273))]
+ pub fn BIO_meth_free(biom: *mut BIO_METHOD);
+ // FIXME should wrap in Option
+ #[cfg(any(ossl110, libressl273))]
+ pub fn BIO_meth_set_write(
+ biom: *mut BIO_METHOD,
+ write: unsafe extern "C" fn(*mut BIO, *const c_char, c_int) -> c_int,
+ ) -> c_int;
+ #[cfg(any(ossl110, libressl273))]
+ pub fn BIO_meth_set_read(
+ biom: *mut BIO_METHOD,
+ read: unsafe extern "C" fn(*mut BIO, *mut c_char, c_int) -> c_int,
+ ) -> c_int;
+ #[cfg(any(ossl110, libressl273))]
+ pub fn BIO_meth_set_puts(
+ biom: *mut BIO_METHOD,
+ read: unsafe extern "C" fn(*mut BIO, *const c_char) -> c_int,
+ ) -> c_int;
+ #[cfg(any(ossl110, libressl273))]
+ pub fn BIO_meth_set_ctrl(
+ biom: *mut BIO_METHOD,
+ read: unsafe extern "C" fn(*mut BIO, c_int, c_long, *mut c_void) -> c_long,
+ ) -> c_int;
+ #[cfg(any(ossl110, libressl273))]
+ pub fn BIO_meth_set_create(
+ biom: *mut BIO_METHOD,
+ create: unsafe extern "C" fn(*mut BIO) -> c_int,
+ ) -> c_int;
+ #[cfg(any(ossl110, libressl273))]
+ pub fn BIO_meth_set_destroy(
+ biom: *mut BIO_METHOD,
+ destroy: unsafe extern "C" fn(*mut BIO) -> c_int,
+ ) -> c_int;
+}

163
lang/rust/files/patch-src_vendor_openssl-sys_src_bn.rs Normal file
View file

@ -0,0 +1,163 @@
--- src/vendor/openssl-sys/src/bn.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/bn.rs
@@ -0,0 +1,160 @@
+use libc::*;
+
+use *;
+
+#[cfg(target_pointer_width = "64")]
+pub type BN_ULONG = c_ulonglong;
+#[cfg(target_pointer_width = "32")]
+pub type BN_ULONG = c_uint;
+
+extern "C" {
+ pub fn BN_CTX_new() -> *mut BN_CTX;
+ pub fn BN_CTX_free(ctx: *mut BN_CTX);
+ pub fn BN_rand(r: *mut BIGNUM, bits: c_int, top: c_int, bottom: c_int) -> c_int;
+ pub fn BN_pseudo_rand(r: *mut BIGNUM, bits: c_int, top: c_int, bottom: c_int) -> c_int;
+ pub fn BN_rand_range(r: *mut BIGNUM, range: *const BIGNUM) -> c_int;
+ pub fn BN_pseudo_rand_range(r: *mut BIGNUM, range: *const BIGNUM) -> c_int;
+ pub fn BN_new() -> *mut BIGNUM;
+ pub fn BN_num_bits(bn: *const BIGNUM) -> c_int;
+ pub fn BN_clear_free(bn: *mut BIGNUM);
+ pub fn BN_bin2bn(s: *const u8, size: c_int, ret: *mut BIGNUM) -> *mut BIGNUM;
+ pub fn BN_bn2bin(a: *const BIGNUM, to: *mut u8) -> c_int;
+ pub fn BN_sub(r: *mut BIGNUM, a: *const BIGNUM, b: *const BIGNUM) -> c_int;
+ pub fn BN_add(r: *mut BIGNUM, a: *const BIGNUM, b: *const BIGNUM) -> c_int;
+ pub fn BN_mul(r: *mut BIGNUM, a: *const BIGNUM, b: *const BIGNUM, ctx: *mut BN_CTX) -> c_int;
+ pub fn BN_sqr(r: *mut BIGNUM, a: *const BIGNUM, ctx: *mut BN_CTX) -> c_int;
+ pub fn BN_set_negative(bn: *mut BIGNUM, n: c_int);
+ #[cfg(ossl110)]
+ pub fn BN_is_negative(b: *const ::BIGNUM) -> c_int;
+
+ pub fn BN_div(
+ dv: *mut BIGNUM,
+ rem: *mut BIGNUM,
+ a: *const BIGNUM,
+ b: *const BIGNUM,
+ ctx: *mut BN_CTX,
+ ) -> c_int;
+ pub fn BN_nnmod(
+ rem: *mut BIGNUM,
+ a: *const BIGNUM,
+ m: *const BIGNUM,
+ ctx: *mut BN_CTX,
+ ) -> c_int;
+ pub fn BN_mod_add(
+ r: *mut BIGNUM,
+ a: *const BIGNUM,
+ b: *const BIGNUM,
+ m: *const BIGNUM,
+ ctx: *mut BN_CTX,
+ ) -> c_int;
+ pub fn BN_mod_sub(
+ r: *mut BIGNUM,
+ a: *const BIGNUM,
+ b: *const BIGNUM,
+ m: *const BIGNUM,
+ ctx: *mut BN_CTX,
+ ) -> c_int;
+ pub fn BN_mod_mul(
+ r: *mut BIGNUM,
+ a: *const BIGNUM,
+ b: *const BIGNUM,
+ m: *const BIGNUM,
+ ctx: *mut BN_CTX,
+ ) -> c_int;
+ pub fn BN_mod_sqr(
+ r: *mut BIGNUM,
+ a: *const BIGNUM,
+ m: *const BIGNUM,
+ ctx: *mut BN_CTX,
+ ) -> c_int;
+
+ pub fn BN_mod_word(r: *const BIGNUM, w: BN_ULONG) -> BN_ULONG;
+ pub fn BN_div_word(r: *mut BIGNUM, w: BN_ULONG) -> BN_ULONG;
+ pub fn BN_mul_word(r: *mut BIGNUM, w: BN_ULONG) -> c_int;
+ pub fn BN_add_word(r: *mut BIGNUM, w: BN_ULONG) -> c_int;
+ pub fn BN_sub_word(r: *mut BIGNUM, w: BN_ULONG) -> c_int;
+ pub fn BN_set_word(bn: *mut BIGNUM, n: BN_ULONG) -> c_int;
+
+ pub fn BN_cmp(a: *const BIGNUM, b: *const BIGNUM) -> c_int;
+ pub fn BN_free(bn: *mut BIGNUM);
+ pub fn BN_is_bit_set(a: *const BIGNUM, n: c_int) -> c_int;
+ pub fn BN_lshift(r: *mut BIGNUM, a: *const BIGNUM, n: c_int) -> c_int;
+ pub fn BN_lshift1(r: *mut BIGNUM, a: *const BIGNUM) -> c_int;
+ pub fn BN_exp(r: *mut BIGNUM, a: *const BIGNUM, p: *const BIGNUM, ctx: *mut BN_CTX) -> c_int;
+
+ pub fn BN_mod_exp(
+ r: *mut BIGNUM,
+ a: *const BIGNUM,
+ p: *const BIGNUM,
+ m: *const BIGNUM,
+ ctx: *mut BN_CTX,
+ ) -> c_int;
+
+ pub fn BN_mask_bits(a: *mut BIGNUM, n: c_int) -> c_int;
+ pub fn BN_rshift(r: *mut BIGNUM, a: *const BIGNUM, n: c_int) -> c_int;
+ pub fn BN_rshift1(r: *mut BIGNUM, a: *const BIGNUM) -> c_int;
+ pub fn BN_bn2hex(a: *const BIGNUM) -> *mut c_char;
+ pub fn BN_bn2dec(a: *const BIGNUM) -> *mut c_char;
+ pub fn BN_hex2bn(a: *mut *mut BIGNUM, s: *const c_char) -> c_int;
+ pub fn BN_dec2bn(a: *mut *mut BIGNUM, s: *const c_char) -> c_int;
+ pub fn BN_gcd(r: *mut BIGNUM, a: *const BIGNUM, b: *const BIGNUM, ctx: *mut BN_CTX) -> c_int;
+ pub fn BN_mod_inverse(
+ r: *mut BIGNUM,
+ a: *const BIGNUM,
+ n: *const BIGNUM,
+ ctx: *mut BN_CTX,
+ ) -> *mut BIGNUM;
+ pub fn BN_clear(bn: *mut BIGNUM);
+ pub fn BN_dup(n: *const BIGNUM) -> *mut BIGNUM;
+ pub fn BN_ucmp(a: *const BIGNUM, b: *const BIGNUM) -> c_int;
+ pub fn BN_set_bit(a: *mut BIGNUM, n: c_int) -> c_int;
+ pub fn BN_clear_bit(a: *mut BIGNUM, n: c_int) -> c_int;
+
+ pub fn BN_generate_prime_ex(
+ r: *mut BIGNUM,
+ bits: c_int,
+ safe: c_int,
+ add: *const BIGNUM,
+ rem: *const BIGNUM,
+ cb: *mut BN_GENCB,
+ ) -> c_int;
+ pub fn BN_is_prime_ex(
+ p: *const BIGNUM,
+ checks: c_int,
+ ctx: *mut BN_CTX,
+ cb: *mut BN_GENCB,
+ ) -> c_int;
+ pub fn BN_is_prime_fasttest_ex(
+ p: *const BIGNUM,
+ checks: c_int,
+ ctx: *mut BN_CTX,
+ do_trial_division: c_int,
+ cb: *mut BN_GENCB,
+ ) -> c_int;
+}
+
+cfg_if! {
+ if #[cfg(ossl110)] {
+ extern "C" {
+ pub fn BN_get_rfc2409_prime_768(bn: *mut BIGNUM) -> *mut BIGNUM;
+ pub fn BN_get_rfc2409_prime_1024(bn: *mut BIGNUM) -> *mut BIGNUM;
+ pub fn BN_get_rfc3526_prime_1536(bn: *mut BIGNUM) -> *mut BIGNUM;
+ pub fn BN_get_rfc3526_prime_2048(bn: *mut BIGNUM) -> *mut BIGNUM;
+ pub fn BN_get_rfc3526_prime_3072(bn: *mut BIGNUM) -> *mut BIGNUM;
+ pub fn BN_get_rfc3526_prime_4096(bn: *mut BIGNUM) -> *mut BIGNUM;
+ pub fn BN_get_rfc3526_prime_6144(bn: *mut BIGNUM) -> *mut BIGNUM;
+ pub fn BN_get_rfc3526_prime_8192(bn: *mut BIGNUM) -> *mut BIGNUM;
+ }
+ } else {
+ extern "C" {
+ pub fn get_rfc2409_prime_768(bn: *mut BIGNUM) -> *mut BIGNUM;
+ pub fn get_rfc2409_prime_1024(bn: *mut BIGNUM) -> *mut BIGNUM;
+ pub fn get_rfc3526_prime_1536(bn: *mut BIGNUM) -> *mut BIGNUM;
+ pub fn get_rfc3526_prime_2048(bn: *mut BIGNUM) -> *mut BIGNUM;
+ pub fn get_rfc3526_prime_3072(bn: *mut BIGNUM) -> *mut BIGNUM;
+ pub fn get_rfc3526_prime_4096(bn: *mut BIGNUM) -> *mut BIGNUM;
+ pub fn get_rfc3526_prime_6144(bn: *mut BIGNUM) -> *mut BIGNUM;
+ pub fn get_rfc3526_prime_8192(bn: *mut BIGNUM) -> *mut BIGNUM;
+ }
+ }
+}

82
lang/rust/files/patch-src_vendor_openssl-sys_src_cms.rs Normal file
View file

@ -0,0 +1,82 @@
--- src/vendor/openssl-sys/src/cms.rs.orig 2018-09-16 23:52:55 UTC
+++ src/vendor/openssl-sys/src/cms.rs
@@ -0,0 +1,79 @@
+use libc::*;
+
+pub enum CMS_ContentInfo {}
+
+extern "C" {
+ #[cfg(ossl101)]
+ pub fn CMS_ContentInfo_free(cms: *mut ::CMS_ContentInfo);
+ #[cfg(ossl101)]
+ pub fn i2d_CMS_ContentInfo(a: *mut ::CMS_ContentInfo, pp: *mut *mut c_uchar) -> c_int;
+}
+
+#[cfg(ossl101)]
+pub const CMS_TEXT: c_uint = 0x1;
+#[cfg(ossl101)]
+pub const CMS_NOCERTS: c_uint = 0x2;
+#[cfg(ossl101)]
+pub const CMS_NO_CONTENT_VERIFY: c_uint = 0x4;
+#[cfg(ossl101)]
+pub const CMS_NO_ATTR_VERIFY: c_uint = 0x8;
+#[cfg(ossl101)]
+pub const CMS_NOSIGS: c_uint = 0x4 | 0x8;
+#[cfg(ossl101)]
+pub const CMS_NOINTERN: c_uint = 0x10;
+#[cfg(ossl101)]
+pub const CMS_NO_SIGNER_CERT_VERIFY: c_uint = 0x20;
+#[cfg(ossl101)]
+pub const CMS_NOVERIFY: c_uint = 0x20;
+#[cfg(ossl101)]
+pub const CMS_DETACHED: c_uint = 0x40;
+#[cfg(ossl101)]
+pub const CMS_BINARY: c_uint = 0x80;
+#[cfg(ossl101)]
+pub const CMS_NOATTR: c_uint = 0x100;
+#[cfg(ossl101)]
+pub const CMS_NOSMIMECAP: c_uint = 0x200;
+#[cfg(ossl101)]
+pub const CMS_NOOLDMIMETYPE: c_uint = 0x400;
+#[cfg(ossl101)]
+pub const CMS_CRLFEOL: c_uint = 0x800;
+#[cfg(ossl101)]
+pub const CMS_STREAM: c_uint = 0x1000;
+#[cfg(ossl101)]
+pub const CMS_NOCRL: c_uint = 0x2000;
+#[cfg(ossl101)]
+pub const CMS_PARTIAL: c_uint = 0x4000;
+#[cfg(ossl101)]
+pub const CMS_REUSE_DIGEST: c_uint = 0x8000;
+#[cfg(ossl101)]
+pub const CMS_USE_KEYID: c_uint = 0x10000;
+#[cfg(ossl101)]
+pub const CMS_DEBUG_DECRYPT: c_uint = 0x20000;
+#[cfg(ossl102)]
+pub const CMS_KEY_PARAM: c_uint = 0x40000;
+#[cfg(ossl110)]
+pub const CMS_ASCIICRLF: c_uint = 0x80000;
+
+extern "C" {
+ #[cfg(ossl101)]
+ pub fn SMIME_read_CMS(bio: *mut ::BIO, bcont: *mut *mut ::BIO) -> *mut ::CMS_ContentInfo;
+
+ #[cfg(ossl101)]
+ pub fn CMS_sign(
+ signcert: *mut ::X509,
+ pkey: *mut ::EVP_PKEY,
+ certs: *mut ::stack_st_X509,
+ data: *mut ::BIO,
+ flags: c_uint,
+ ) -> *mut ::CMS_ContentInfo;
+
+ #[cfg(ossl101)]
+ pub fn CMS_decrypt(
+ cms: *mut ::CMS_ContentInfo,
+ pkey: *mut ::EVP_PKEY,
+ cert: *mut ::X509,
+ dcont: *mut ::BIO,
+ out: *mut ::BIO,
+ flags: c_uint,
+ ) -> c_int;
+}

10
lang/rust/files/patch-src_vendor_openssl-sys_src_conf.rs Normal file
View file

@ -0,0 +1,10 @@
--- src/vendor/openssl-sys/src/conf.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/conf.rs
@@ -0,0 +1,7 @@
+use *;
+
+extern "C" {
+ pub fn NCONF_new(meth: *mut CONF_METHOD) -> *mut CONF;
+ pub fn NCONF_default() -> *mut CONF_METHOD;
+ pub fn NCONF_free(conf: *mut CONF);
+}

125
lang/rust/files/patch-src_vendor_openssl-sys_src_crypto.rs Normal file
View file

@ -0,0 +1,125 @@
--- src/vendor/openssl-sys/src/crypto.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/crypto.rs
@@ -0,0 +1,122 @@
+use libc::*;
+
+use *;
+
+#[cfg(not(ossl110))]
+pub const CRYPTO_LOCK_X509: c_int = 3;
+#[cfg(not(ossl110))]
+pub const CRYPTO_LOCK_SSL_CTX: c_int = 12;
+#[cfg(not(ossl110))]
+pub const CRYPTO_LOCK_SSL_SESSION: c_int = 14;
+
+stack!(stack_st_void);
+
+cfg_if! {
+ if #[cfg(ossl110)] {
+ pub const CRYPTO_EX_INDEX_SSL: c_int = 0;
+ pub const CRYPTO_EX_INDEX_SSL_CTX: c_int = 1;
+
+ extern "C" {
+ pub fn OpenSSL_version_num() -> c_ulong;
+ pub fn OpenSSL_version(key: c_int) -> *const c_char;
+ }
+ pub const OPENSSL_VERSION: c_int = 0;
+ pub const OPENSSL_CFLAGS: c_int = 1;
+ pub const OPENSSL_BUILT_ON: c_int = 2;
+ pub const OPENSSL_PLATFORM: c_int = 3;
+ pub const OPENSSL_DIR: c_int = 4;
+ } else {
+ extern "C" {
+ pub fn SSLeay() -> c_ulong;
+ pub fn SSLeay_version(key: c_int) -> *const c_char;
+ }
+ pub const SSLEAY_VERSION: c_int = 0;
+ pub const SSLEAY_CFLAGS: c_int = 2;
+ pub const SSLEAY_BUILT_ON: c_int = 3;
+ pub const SSLEAY_PLATFORM: c_int = 4;
+ pub const SSLEAY_DIR: c_int = 5;
+ }
+}
+
+// FIXME should be options
+pub type CRYPTO_EX_new = unsafe extern "C" fn(
+ parent: *mut c_void,
+ ptr: *mut c_void,
+ ad: *const CRYPTO_EX_DATA,
+ idx: c_int,
+ argl: c_long,
+ argp: *const c_void,
+) -> c_int;
+pub type CRYPTO_EX_dup = unsafe extern "C" fn(
+ to: *mut CRYPTO_EX_DATA,
+ from: *mut CRYPTO_EX_DATA,
+ from_d: *mut c_void,
+ idx: c_int,
+ argl: c_long,
+ argp: *mut c_void,
+) -> c_int;
+pub type CRYPTO_EX_free = unsafe extern "C" fn(
+ parent: *mut c_void,
+ ptr: *mut c_void,
+ ad: *mut CRYPTO_EX_DATA,
+ idx: c_int,
+ argl: c_long,
+ argp: *mut c_void,
+);
+extern "C" {
+ #[cfg(ossl110)]
+ pub fn CRYPTO_get_ex_new_index(
+ class_index: c_int,
+ argl: c_long,
+ argp: *mut c_void,
+ new_func: Option<CRYPTO_EX_new>,
+ dup_func: Option<CRYPTO_EX_dup>,
+ free_func: Option<CRYPTO_EX_free>,
+ ) -> c_int;
+}
+
+pub const CRYPTO_LOCK: c_int = 1;
+
+extern "C" {
+ #[cfg(not(ossl110))]
+ pub fn CRYPTO_num_locks() -> c_int;
+ #[cfg(not(ossl110))]
+ pub fn CRYPTO_set_locking_callback(
+ func: unsafe extern "C" fn(mode: c_int, n: c_int, file: *const c_char, line: c_int),
+ );
+
+ #[cfg(not(ossl110))]
+ pub fn CRYPTO_set_id_callback(func: unsafe extern "C" fn() -> c_ulong);
+
+ #[cfg(not(ossl110))]
+ pub fn CRYPTO_add_lock(
+ pointer: *mut c_int,
+ amount: c_int,
+ type_: c_int,
+ file: *const c_char,
+ line: c_int,
+ ) -> c_int;
+}
+
+cfg_if! {
+ if #[cfg(ossl110)] {
+ extern "C" {
+ pub fn CRYPTO_malloc(num: size_t, file: *const c_char, line: c_int) -> *mut c_void;
+ pub fn CRYPTO_free(buf: *mut c_void, file: *const c_char, line: c_int);
+ }
+ } else {
+ extern "C" {
+ pub fn CRYPTO_malloc(num: c_int, file: *const c_char, line: c_int) -> *mut c_void;
+ pub fn CRYPTO_free(buf: *mut c_void);
+ }
+ }
+}
+
+extern "C" {
+ #[cfg(ossl101)]
+ pub fn FIPS_mode() -> c_int;
+ #[cfg(ossl101)]
+ pub fn FIPS_mode_set(onoff: c_int) -> c_int;
+
+ pub fn CRYPTO_memcmp(a: *const c_void, b: *const c_void, len: size_t) -> c_int;
+}

27
lang/rust/files/patch-src_vendor_openssl-sys_src_dh.rs Normal file
View file

@ -0,0 +1,27 @@
--- src/vendor/openssl-sys/src/dh.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/dh.rs
@@ -0,0 +1,24 @@
+use *;
+
+extern "C" {
+ pub fn DH_new() -> *mut DH;
+ pub fn DH_free(dh: *mut DH);
+
+ pub fn d2i_DHparams(k: *mut *mut DH, pp: *mut *const c_uchar, length: c_long) -> *mut DH;
+ pub fn i2d_DHparams(dh: *const DH, pp: *mut *mut c_uchar) -> c_int;
+
+ #[cfg(ossl102)]
+ pub fn DH_get_1024_160() -> *mut DH;
+ #[cfg(ossl102)]
+ pub fn DH_get_2048_224() -> *mut DH;
+ #[cfg(ossl102)]
+ pub fn DH_get_2048_256() -> *mut DH;
+
+ #[cfg(any(ossl110, libressl273))]
+ pub fn DH_set0_pqg(
+ dh: *mut DH,
+ p: *mut BIGNUM,
+ q: *mut BIGNUM,
+ g: *mut BIGNUM,
+ ) -> c_int;
+}

69
lang/rust/files/patch-src_vendor_openssl-sys_src_dsa.rs Normal file
View file

@ -0,0 +1,69 @@
--- src/vendor/openssl-sys/src/dsa.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/dsa.rs
@@ -0,0 +1,66 @@
+use libc::*;
+
+use *;
+
+extern "C" {
+ pub fn DSA_new() -> *mut DSA;
+ pub fn DSA_free(dsa: *mut DSA);
+ pub fn DSA_size(dsa: *const DSA) -> c_int;
+ pub fn DSA_sign(
+ dummy: c_int,
+ dgst: *const c_uchar,
+ len: c_int,
+ sigret: *mut c_uchar,
+ siglen: *mut c_uint,
+ dsa: *mut DSA,
+ ) -> c_int;
+ pub fn DSA_verify(
+ dummy: c_int,
+ dgst: *const c_uchar,
+ len: c_int,
+ sigbuf: *const c_uchar,
+ siglen: c_int,
+ dsa: *mut DSA,
+ ) -> c_int;
+
+ pub fn d2i_DSAPublicKey(a: *mut *mut DSA, pp: *mut *const c_uchar, length: c_long) -> *mut DSA;
+ pub fn d2i_DSAPrivateKey(a: *mut *mut DSA, pp: *mut *const c_uchar, length: c_long)
+ -> *mut DSA;
+
+ pub fn DSA_generate_parameters_ex(
+ dsa: *mut DSA,
+ bits: c_int,
+ seed: *const c_uchar,
+ seed_len: c_int,
+ counter_ref: *mut c_int,
+ h_ret: *mut c_ulong,
+ cb: *mut BN_GENCB,
+ ) -> c_int;
+
+ pub fn DSA_generate_key(dsa: *mut DSA) -> c_int;
+ pub fn i2d_DSAPublicKey(a: *const DSA, pp: *mut *mut c_uchar) -> c_int;
+ pub fn i2d_DSAPrivateKey(a: *const DSA, pp: *mut *mut c_uchar) -> c_int;
+
+ #[cfg(any(ossl110, libressl273))]
+ pub fn DSA_get0_pqg(
+ d: *const DSA,
+ p: *mut *const BIGNUM,
+ q: *mut *const BIGNUM,
+ q: *mut *const BIGNUM,
+ );
+ #[cfg(any(ossl110, libressl273))]
+ pub fn DSA_set0_pqg(
+ d: *mut DSA,
+ p: *mut BIGNUM,
+ q: *mut BIGNUM,
+ q: *mut BIGNUM,
+ ) -> c_int;
+ #[cfg(any(ossl110, libressl273))]
+ pub fn DSA_get0_key(
+ d: *const DSA,
+ pub_key: *mut *const BIGNUM,
+ priv_key: *mut *const BIGNUM,
+ );
+ #[cfg(any(ossl110, libressl273))]
+ pub fn DSA_set0_key(d: *mut DSA, pub_key: *mut BIGNUM, priv_key: *mut BIGNUM) -> c_int;
+}

6
lang/rust/files/patch-src_vendor_openssl-sys_src_dtls1.rs Normal file
View file

@ -0,0 +1,6 @@
--- src/vendor/openssl-sys/src/dtls1.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/dtls1.rs
@@ -0,0 +1,3 @@
+use libc::*;
+
+pub const DTLS1_COOKIE_LENGTH: c_uint = 256;

206
lang/rust/files/patch-src_vendor_openssl-sys_src_ec.rs Normal file
View file

@ -0,0 +1,206 @@
--- src/vendor/openssl-sys/src/ec.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/ec.rs
@@ -0,0 +1,203 @@
+use libc::*;
+
+use *;
+
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub enum point_conversion_form_t {
+ POINT_CONVERSION_COMPRESSED = 2,
+ POINT_CONVERSION_UNCOMPRESSED = 4,
+ POINT_CONVERSION_HYBRID = 6,
+}
+
+pub enum EC_METHOD {}
+pub enum EC_GROUP {}
+pub enum EC_POINT {}
+
+pub const OPENSSL_EC_NAMED_CURVE: c_int = 1;
+
+extern "C" {
+ #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))]
+ pub fn EC_GF2m_simple_method() -> *const EC_METHOD;
+
+ pub fn EC_GROUP_new(meth: *const EC_METHOD) -> *mut EC_GROUP;
+
+ pub fn EC_GROUP_free(group: *mut EC_GROUP);
+
+ pub fn EC_GROUP_get_order(
+ group: *const EC_GROUP,
+ order: *mut BIGNUM,
+ ctx: *mut BN_CTX,
+ ) -> c_int;
+
+ pub fn EC_GROUP_set_asn1_flag(key: *mut EC_GROUP, flag: c_int);
+
+ pub fn EC_GROUP_get_curve_GFp(
+ group: *const EC_GROUP,
+ p: *mut BIGNUM,
+ a: *mut BIGNUM,
+ b: *mut BIGNUM,
+ ctx: *mut BN_CTX,
+ ) -> c_int;
+
+ #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))]
+ pub fn EC_GROUP_get_curve_GF2m(
+ group: *const EC_GROUP,
+ p: *mut BIGNUM,
+ a: *mut BIGNUM,
+ b: *mut BIGNUM,
+ ctx: *mut BN_CTX,
+ ) -> c_int;
+
+ pub fn EC_GROUP_get_degree(group: *const EC_GROUP) -> c_int;
+
+ pub fn EC_GROUP_new_curve_GFp(
+ p: *const BIGNUM,
+ a: *const BIGNUM,
+ b: *const BIGNUM,
+ ctx: *mut BN_CTX,
+ ) -> *mut EC_GROUP;
+
+ #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))]
+ pub fn EC_GROUP_new_curve_GF2m(
+ p: *const BIGNUM,
+ a: *const BIGNUM,
+ b: *const BIGNUM,
+ ctx: *mut BN_CTX,
+ ) -> *mut EC_GROUP;
+
+ pub fn EC_GROUP_new_by_curve_name(nid: c_int) -> *mut EC_GROUP;
+
+ pub fn EC_POINT_new(group: *const EC_GROUP) -> *mut EC_POINT;
+
+ pub fn EC_POINT_free(point: *mut EC_POINT);
+
+ pub fn EC_POINT_get_affine_coordinates_GFp(
+ group: *const EC_GROUP,
+ p: *const EC_POINT,
+ x: *mut BIGNUM,
+ y: *mut BIGNUM,
+ ctx: *mut BN_CTX,
+ ) -> c_int;
+
+ #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))]
+ pub fn EC_POINT_get_affine_coordinates_GF2m(
+ group: *const EC_GROUP,
+ p: *const EC_POINT,
+ x: *mut BIGNUM,
+ y: *mut BIGNUM,
+ ctx: *mut BN_CTX,
+ ) -> c_int;
+
+ pub fn EC_POINT_point2oct(
+ group: *const EC_GROUP,
+ p: *const EC_POINT,
+ form: point_conversion_form_t,
+ buf: *mut c_uchar,
+ len: size_t,
+ ctx: *mut BN_CTX,
+ ) -> size_t;
+
+ pub fn EC_POINT_oct2point(
+ group: *const EC_GROUP,
+ p: *mut EC_POINT,
+ buf: *const c_uchar,
+ len: size_t,
+ ctx: *mut BN_CTX,
+ ) -> c_int;
+
+ pub fn EC_POINT_add(
+ group: *const EC_GROUP,
+ r: *mut EC_POINT,
+ a: *const EC_POINT,
+ b: *const EC_POINT,
+ ctx: *mut BN_CTX,
+ ) -> c_int;
+
+ pub fn EC_POINT_invert(group: *const EC_GROUP, r: *mut EC_POINT, ctx: *mut BN_CTX) -> c_int;
+
+ pub fn EC_POINT_cmp(
+ group: *const EC_GROUP,
+ a: *const EC_POINT,
+ b: *const EC_POINT,
+ ctx: *mut BN_CTX,
+ ) -> c_int;
+
+ pub fn EC_POINT_mul(
+ group: *const EC_GROUP,
+ r: *mut EC_POINT,
+ n: *const BIGNUM,
+ q: *const EC_POINT,
+ m: *const BIGNUM,
+ ctx: *mut BN_CTX,
+ ) -> c_int;
+
+ pub fn EC_KEY_new() -> *mut EC_KEY;
+
+ pub fn EC_KEY_new_by_curve_name(nid: c_int) -> *mut EC_KEY;
+
+ pub fn EC_KEY_free(key: *mut EC_KEY);
+
+ pub fn EC_KEY_dup(key: *const EC_KEY) -> *mut EC_KEY;
+
+ pub fn EC_KEY_up_ref(key: *mut EC_KEY) -> c_int;
+
+ pub fn EC_KEY_get0_group(key: *const EC_KEY) -> *const EC_GROUP;
+
+ pub fn EC_KEY_set_group(key: *mut EC_KEY, group: *const EC_GROUP) -> c_int;
+
+ pub fn EC_KEY_get0_private_key(key: *const EC_KEY) -> *const BIGNUM;
+
+ pub fn EC_KEY_set_private_key(key: *mut EC_KEY, key: *const BIGNUM) -> c_int;
+
+ pub fn EC_KEY_get0_public_key(key: *const EC_KEY) -> *const EC_POINT;
+
+ pub fn EC_KEY_set_public_key(key: *mut EC_KEY, key: *const EC_POINT) -> c_int;
+
+ pub fn EC_KEY_generate_key(key: *mut EC_KEY) -> c_int;
+
+ pub fn EC_KEY_check_key(key: *const EC_KEY) -> c_int;
+
+ pub fn EC_KEY_set_public_key_affine_coordinates(
+ key: *mut EC_KEY,
+ x: *mut BIGNUM,
+ y: *mut BIGNUM,
+ ) -> c_int;
+}
+
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ pub enum ECDSA_SIG {}
+ } else {
+ #[repr(C)]
+ pub struct ECDSA_SIG {
+ pub r: *mut BIGNUM,
+ pub s: *mut BIGNUM,
+ }
+ }
+}
+
+extern "C" {
+ pub fn ECDSA_SIG_new() -> *mut ECDSA_SIG;
+
+ pub fn ECDSA_SIG_free(sig: *mut ECDSA_SIG);
+
+ #[cfg(any(ossl110, libressl273))]
+ pub fn ECDSA_SIG_get0(sig: *const ECDSA_SIG, pr: *mut *const BIGNUM, ps: *mut *const BIGNUM);
+
+ #[cfg(any(ossl110, libressl273))]
+ pub fn ECDSA_SIG_set0(sig: *mut ECDSA_SIG, pr: *mut BIGNUM, ps: *mut BIGNUM) -> c_int;
+
+ pub fn ECDSA_do_sign(
+ dgst: *const c_uchar,
+ dgst_len: c_int,
+ eckey: *mut EC_KEY,
+ ) -> *mut ECDSA_SIG;
+
+ pub fn ECDSA_do_verify(
+ dgst: *const c_uchar,
+ dgst_len: c_int,
+ sig: *const ECDSA_SIG,
+ eckey: *mut EC_KEY,
+ ) -> c_int;
+}

53
lang/rust/files/patch-src_vendor_openssl-sys_src_err.rs Normal file
View file

@ -0,0 +1,53 @@
--- src/vendor/openssl-sys/src/err.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/err.rs
@@ -0,0 +1,50 @@
+use libc::*;
+
+pub const ERR_TXT_MALLOCED: c_int = 0x01;
+pub const ERR_TXT_STRING: c_int = 0x02;
+
+pub const ERR_LIB_PEM: c_int = 9;
+
+pub fn ERR_GET_LIB(l: c_ulong) -> c_int {
+ ((l >> 24) & 0x0FF) as c_int
+}
+
+pub fn ERR_GET_FUNC(l: c_ulong) -> c_int {
+ ((l >> 12) & 0xFFF) as c_int
+}
+
+pub fn ERR_GET_REASON(l: c_ulong) -> c_int {
+ (l & 0xFFF) as c_int
+}
+
+#[repr(C)]
+pub struct ERR_STRING_DATA {
+ pub error: c_ulong,
+ pub string: *const c_char,
+}
+
+extern "C" {
+ pub fn ERR_put_error(lib: c_int, func: c_int, reason: c_int, file: *const c_char, line: c_int);
+ pub fn ERR_set_error_data(data: *mut c_char, flags: c_int);
+
+ pub fn ERR_get_error() -> c_ulong;
+ pub fn ERR_get_error_line_data(
+ file: *mut *const c_char,
+ line: *mut c_int,
+ data: *mut *const c_char,
+ flags: *mut c_int,
+ ) -> c_ulong;
+ pub fn ERR_peek_last_error() -> c_ulong;
+ pub fn ERR_clear_error();
+ pub fn ERR_lib_error_string(err: c_ulong) -> *const c_char;
+ pub fn ERR_func_error_string(err: c_ulong) -> *const c_char;
+ pub fn ERR_reason_error_string(err: c_ulong) -> *const c_char;
+ #[cfg(ossl110)]
+ pub fn ERR_load_strings(lib: c_int, str: *mut ERR_STRING_DATA) -> c_int;
+ #[cfg(not(ossl110))]
+ pub fn ERR_load_strings(lib: c_int, str: *mut ERR_STRING_DATA);
+ #[cfg(not(ossl110))]
+ pub fn ERR_load_crypto_strings();
+
+ pub fn ERR_get_next_error_library() -> c_int;
+}

313
lang/rust/files/patch-src_vendor_openssl-sys_src_evp.rs Normal file
View file

@ -0,0 +1,313 @@
--- src/vendor/openssl-sys/src/evp.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/evp.rs
@@ -0,0 +1,310 @@
+use libc::*;
+use *;
+
+pub const EVP_MAX_MD_SIZE: c_uint = 64;
+
+pub const PKCS5_SALT_LEN: c_int = 8;
+pub const PKCS12_DEFAULT_ITER: c_int = 2048;
+
+pub const EVP_PKEY_RSA: c_int = NID_rsaEncryption;
+pub const EVP_PKEY_DSA: c_int = NID_dsa;
+pub const EVP_PKEY_DH: c_int = NID_dhKeyAgreement;
+pub const EVP_PKEY_EC: c_int = NID_X9_62_id_ecPublicKey;
+pub const EVP_PKEY_HMAC: c_int = NID_hmac;
+pub const EVP_PKEY_CMAC: c_int = NID_cmac;
+
+pub const EVP_CTRL_GCM_SET_IVLEN: c_int = 0x9;
+pub const EVP_CTRL_GCM_GET_TAG: c_int = 0x10;
+pub const EVP_CTRL_GCM_SET_TAG: c_int = 0x11;
+
+pub unsafe fn EVP_get_digestbynid(type_: c_int) -> *const EVP_MD {
+ EVP_get_digestbyname(OBJ_nid2sn(type_))
+}
+
+extern "C" {
+ pub fn EVP_MD_size(md: *const EVP_MD) -> c_int;
+
+ #[cfg(any(ossl110, libressl273))]
+ pub fn EVP_CIPHER_key_length(cipher: *const EVP_CIPHER) -> c_int;
+ #[cfg(any(ossl110, libressl273))]
+ pub fn EVP_CIPHER_block_size(cipher: *const EVP_CIPHER) -> c_int;
+ #[cfg(any(ossl110, libressl273))]
+ pub fn EVP_CIPHER_iv_length(cipher: *const EVP_CIPHER) -> c_int;
+}
+
+cfg_if! {
+ if #[cfg(ossl110)] {
+ extern "C" {
+ pub fn EVP_MD_CTX_new() -> *mut EVP_MD_CTX;
+ pub fn EVP_MD_CTX_free(ctx: *mut EVP_MD_CTX);
+ }
+ } else {
+ extern "C" {
+ pub fn EVP_MD_CTX_create() -> *mut EVP_MD_CTX;
+ pub fn EVP_MD_CTX_destroy(ctx: *mut EVP_MD_CTX);
+ }
+ }
+}
+
+extern "C" {
+ pub fn EVP_DigestInit_ex(ctx: *mut EVP_MD_CTX, typ: *const EVP_MD, imple: *mut ENGINE)
+ -> c_int;
+ pub fn EVP_DigestUpdate(ctx: *mut EVP_MD_CTX, data: *const c_void, n: size_t) -> c_int;
+ pub fn EVP_DigestFinal_ex(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32) -> c_int;
+ pub fn EVP_DigestInit(ctx: *mut EVP_MD_CTX, typ: *const EVP_MD) -> c_int;
+ pub fn EVP_DigestFinal(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32) -> c_int;
+
+ pub fn EVP_BytesToKey(
+ typ: *const EVP_CIPHER,
+ md: *const EVP_MD,
+ salt: *const u8,
+ data: *const u8,
+ datalen: c_int,
+ count: c_int,
+ key: *mut u8,
+ iv: *mut u8,
+ ) -> c_int;
+
+ pub fn EVP_CipherInit(
+ ctx: *mut EVP_CIPHER_CTX,
+ evp: *const EVP_CIPHER,
+ key: *const u8,
+ iv: *const u8,
+ mode: c_int,
+ ) -> c_int;
+ pub fn EVP_CipherInit_ex(
+ ctx: *mut EVP_CIPHER_CTX,
+ type_: *const EVP_CIPHER,
+ impl_: *mut ENGINE,
+ key: *const c_uchar,
+ iv: *const c_uchar,
+ enc: c_int,
+ ) -> c_int;
+ pub fn EVP_CipherUpdate(
+ ctx: *mut EVP_CIPHER_CTX,
+ outbuf: *mut u8,
+ outlen: *mut c_int,
+ inbuf: *const u8,
+ inlen: c_int,
+ ) -> c_int;
+ pub fn EVP_CipherFinal(ctx: *mut EVP_CIPHER_CTX, res: *mut u8, len: *mut c_int) -> c_int;
+
+ pub fn EVP_DigestSignInit(
+ ctx: *mut EVP_MD_CTX,
+ pctx: *mut *mut EVP_PKEY_CTX,
+ type_: *const EVP_MD,
+ e: *mut ENGINE,
+ pkey: *mut EVP_PKEY,
+ ) -> c_int;
+ pub fn EVP_DigestSignFinal(
+ ctx: *mut EVP_MD_CTX,
+ sig: *mut c_uchar,
+ siglen: *mut size_t,
+ ) -> c_int;
+ pub fn EVP_DigestVerifyInit(
+ ctx: *mut EVP_MD_CTX,
+ pctx: *mut *mut EVP_PKEY_CTX,
+ type_: *const EVP_MD,
+ e: *mut ENGINE,
+ pkey: *mut EVP_PKEY,
+ ) -> c_int;
+}
+cfg_if! {
+ if #[cfg(any(ossl102, libressl280))] {
+ extern "C" {
+ pub fn EVP_DigestVerifyFinal(
+ ctx: *mut EVP_MD_CTX,
+ sigret: *const c_uchar,
+ siglen: size_t,
+ ) -> c_int;
+ }
+ } else {
+ extern "C" {
+ pub fn EVP_DigestVerifyFinal(
+ ctx: *mut EVP_MD_CTX,
+ sigret: *mut c_uchar,
+ siglen: size_t,
+ ) -> c_int;
+ }
+ }
+}
+
+extern "C" {
+ pub fn EVP_CIPHER_CTX_new() -> *mut EVP_CIPHER_CTX;
+ pub fn EVP_CIPHER_CTX_free(ctx: *mut EVP_CIPHER_CTX);
+ pub fn EVP_MD_CTX_copy_ex(dst: *mut EVP_MD_CTX, src: *const EVP_MD_CTX) -> c_int;
+ pub fn EVP_CIPHER_CTX_set_key_length(ctx: *mut EVP_CIPHER_CTX, keylen: c_int) -> c_int;
+ pub fn EVP_CIPHER_CTX_set_padding(ctx: *mut EVP_CIPHER_CTX, padding: c_int) -> c_int;
+ pub fn EVP_CIPHER_CTX_ctrl(
+ ctx: *mut EVP_CIPHER_CTX,
+ type_: c_int,
+ arg: c_int,
+ ptr: *mut c_void,
+ ) -> c_int;
+
+ pub fn EVP_md5() -> *const EVP_MD;
+ pub fn EVP_sha1() -> *const EVP_MD;
+ pub fn EVP_sha224() -> *const EVP_MD;
+ pub fn EVP_sha256() -> *const EVP_MD;
+ pub fn EVP_sha384() -> *const EVP_MD;
+ pub fn EVP_sha512() -> *const EVP_MD;
+ pub fn EVP_ripemd160() -> *const EVP_MD;
+ pub fn EVP_des_ecb() -> *const EVP_CIPHER;
+ pub fn EVP_des_ede3() -> *const EVP_CIPHER;
+ pub fn EVP_des_ede3_cbc() -> *const EVP_CIPHER;
+ pub fn EVP_des_cbc() -> *const EVP_CIPHER;
+ pub fn EVP_rc4() -> *const EVP_CIPHER;
+ pub fn EVP_bf_ecb() -> *const EVP_CIPHER;
+ pub fn EVP_bf_cbc() -> *const EVP_CIPHER;
+ pub fn EVP_bf_cfb64() -> *const EVP_CIPHER;
+ pub fn EVP_bf_ofb() -> *const EVP_CIPHER;
+ pub fn EVP_aes_128_ecb() -> *const EVP_CIPHER;
+ pub fn EVP_aes_128_cbc() -> *const EVP_CIPHER;
+ pub fn EVP_aes_128_cfb1() -> *const EVP_CIPHER;
+ pub fn EVP_aes_128_cfb8() -> *const EVP_CIPHER;
+ pub fn EVP_aes_128_cfb128() -> *const EVP_CIPHER;
+ pub fn EVP_aes_128_ctr() -> *const EVP_CIPHER;
+ pub fn EVP_aes_128_ccm() -> *const EVP_CIPHER;
+ pub fn EVP_aes_128_gcm() -> *const EVP_CIPHER;
+ pub fn EVP_aes_128_xts() -> *const EVP_CIPHER;
+ pub fn EVP_aes_256_ecb() -> *const EVP_CIPHER;
+ pub fn EVP_aes_256_cbc() -> *const EVP_CIPHER;
+ pub fn EVP_aes_256_cfb1() -> *const EVP_CIPHER;
+ pub fn EVP_aes_256_cfb8() -> *const EVP_CIPHER;
+ pub fn EVP_aes_256_cfb128() -> *const EVP_CIPHER;
+ pub fn EVP_aes_256_ctr() -> *const EVP_CIPHER;
+ pub fn EVP_aes_256_ccm() -> *const EVP_CIPHER;
+ pub fn EVP_aes_256_gcm() -> *const EVP_CIPHER;
+ pub fn EVP_aes_256_xts() -> *const EVP_CIPHER;
+ #[cfg(ossl110)]
+ pub fn EVP_chacha20() -> *const ::EVP_CIPHER;
+ #[cfg(ossl110)]
+ pub fn EVP_chacha20_poly1305() -> *const ::EVP_CIPHER;
+
+ #[cfg(not(ossl110))]
+ pub fn OPENSSL_add_all_algorithms_noconf();
+
+ pub fn EVP_get_digestbyname(name: *const c_char) -> *const EVP_MD;
+ pub fn EVP_get_cipherbyname(name: *const c_char) -> *const EVP_CIPHER;
+
+ pub fn EVP_PKEY_id(pkey: *const EVP_PKEY) -> c_int;
+}
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ extern "C" {
+ pub fn EVP_PKEY_bits(key: *const EVP_PKEY) -> c_int;
+ }
+ } else {
+ extern "C" {
+ pub fn EVP_PKEY_bits(key: *mut EVP_PKEY) -> c_int;
+ }
+ }
+}
+extern "C" {
+ pub fn EVP_PKEY_assign(pkey: *mut EVP_PKEY, typ: c_int, key: *mut c_void) -> c_int;
+
+ pub fn EVP_PKEY_set1_RSA(k: *mut EVP_PKEY, r: *mut RSA) -> c_int;
+ pub fn EVP_PKEY_get1_RSA(k: *mut EVP_PKEY) -> *mut RSA;
+ pub fn EVP_PKEY_get1_DSA(k: *mut EVP_PKEY) -> *mut DSA;
+ pub fn EVP_PKEY_get1_DH(k: *mut EVP_PKEY) -> *mut DH;
+ pub fn EVP_PKEY_get1_EC_KEY(k: *mut EVP_PKEY) -> *mut EC_KEY;
+
+ pub fn EVP_PKEY_new() -> *mut EVP_PKEY;
+ pub fn EVP_PKEY_free(k: *mut EVP_PKEY);
+
+ pub fn d2i_AutoPrivateKey(
+ a: *mut *mut EVP_PKEY,
+ pp: *mut *const c_uchar,
+ length: c_long,
+ ) -> *mut EVP_PKEY;
+
+ pub fn EVP_PKEY_cmp(a: *const EVP_PKEY, b: *const EVP_PKEY) -> c_int;
+
+ pub fn EVP_PKEY_copy_parameters(to: *mut EVP_PKEY, from: *const EVP_PKEY) -> c_int;
+
+ pub fn PKCS5_PBKDF2_HMAC_SHA1(
+ pass: *const c_char,
+ passlen: c_int,
+ salt: *const u8,
+ saltlen: c_int,
+ iter: c_int,
+ keylen: c_int,
+ out: *mut u8,
+ ) -> c_int;
+ pub fn PKCS5_PBKDF2_HMAC(
+ pass: *const c_char,
+ passlen: c_int,
+ salt: *const c_uchar,
+ saltlen: c_int,
+ iter: c_int,
+ digest: *const EVP_MD,
+ keylen: c_int,
+ out: *mut u8,
+ ) -> c_int;
+
+ #[cfg(ossl110)]
+ pub fn EVP_PBE_scrypt(
+ pass: *const c_char,
+ passlen: size_t,
+ salt: *const c_uchar,
+ saltlen: size_t,
+ N: u64,
+ r: u64,
+ p: u64,
+ maxmem: u64,
+ key: *mut c_uchar,
+ keylen: size_t,
+ ) -> c_int;
+}
+
+pub const EVP_PKEY_OP_KEYGEN: c_int = 1 << 2;
+pub const EVP_PKEY_OP_SIGN: c_int = 1 << 3;
+pub const EVP_PKEY_OP_VERIFY: c_int = 1 << 4;
+pub const EVP_PKEY_OP_VERIFYRECOVER: c_int = 1 << 5;
+pub const EVP_PKEY_OP_SIGNCTX: c_int = 1 << 6;
+pub const EVP_PKEY_OP_VERIFYCTX: c_int = 1 << 7;
+pub const EVP_PKEY_OP_ENCRYPT: c_int = 1 << 8;
+pub const EVP_PKEY_OP_DECRYPT: c_int = 1 << 9;
+
+pub const EVP_PKEY_OP_TYPE_SIG: c_int = EVP_PKEY_OP_SIGN
+ | EVP_PKEY_OP_VERIFY
+ | EVP_PKEY_OP_VERIFYRECOVER
+ | EVP_PKEY_OP_SIGNCTX
+ | EVP_PKEY_OP_VERIFYCTX;
+
+pub const EVP_PKEY_OP_TYPE_CRYPT: c_int = EVP_PKEY_OP_ENCRYPT | EVP_PKEY_OP_DECRYPT;
+
+pub const EVP_PKEY_CTRL_SET_MAC_KEY: c_int = 6;
+
+pub const EVP_PKEY_CTRL_CIPHER: c_int = 12;
+
+pub const EVP_PKEY_ALG_CTRL: c_int = 0x1000;
+
+extern "C" {
+ pub fn EVP_PKEY_CTX_new(k: *mut EVP_PKEY, e: *mut ENGINE) -> *mut EVP_PKEY_CTX;
+ pub fn EVP_PKEY_CTX_new_id(id: c_int, e: *mut ENGINE) -> *mut EVP_PKEY_CTX;
+ pub fn EVP_PKEY_CTX_free(ctx: *mut EVP_PKEY_CTX);
+
+ pub fn EVP_PKEY_CTX_ctrl(
+ ctx: *mut EVP_PKEY_CTX,
+ keytype: c_int,
+ optype: c_int,
+ cmd: c_int,
+ p1: c_int,
+ p2: *mut c_void,
+ ) -> c_int;
+
+ pub fn EVP_PKEY_new_mac_key(
+ type_: c_int,
+ e: *mut ENGINE,
+ key: *const c_uchar,
+ keylen: c_int,
+ ) -> *mut EVP_PKEY;
+
+ pub fn EVP_PKEY_derive_init(ctx: *mut EVP_PKEY_CTX) -> c_int;
+ pub fn EVP_PKEY_derive_set_peer(ctx: *mut EVP_PKEY_CTX, peer: *mut EVP_PKEY) -> c_int;
+ pub fn EVP_PKEY_derive(ctx: *mut EVP_PKEY_CTX, key: *mut c_uchar, size: *mut size_t) -> c_int;
+
+ pub fn EVP_PKEY_keygen_init(ctx: *mut EVP_PKEY_CTX) -> c_int;
+ pub fn EVP_PKEY_keygen(ctx: *mut EVP_PKEY_CTX, key: *mut *mut EVP_PKEY) -> c_int;
+}

33
lang/rust/files/patch-src_vendor_openssl-sys_src_hmac.rs Normal file
View file

@ -0,0 +1,33 @@
--- src/vendor/openssl-sys/src/hmac.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/hmac.rs
@@ -0,0 +1,30 @@
+use libc::*;
+
+use *;
+
+cfg_if! {
+ if #[cfg(ossl110)] {
+ extern "C" {
+ pub fn HMAC_CTX_new() -> *mut HMAC_CTX;
+ pub fn HMAC_CTX_free(ctx: *mut HMAC_CTX);
+ }
+ } else {
+ extern "C" {
+ pub fn HMAC_CTX_init(ctx: *mut HMAC_CTX);
+ pub fn HMAC_CTX_cleanup(ctx: *mut HMAC_CTX);
+ }
+ }
+}
+
+extern "C" {
+ pub fn HMAC_Init_ex(
+ ctx: *mut HMAC_CTX,
+ key: *const c_void,
+ len: c_int,
+ md: *const EVP_MD,
+ impl_: *mut ENGINE,
+ ) -> c_int;
+ pub fn HMAC_Update(ctx: *mut HMAC_CTX, data: *const c_uchar, len: size_t) -> c_int;
+ pub fn HMAC_Final(ctx: *mut HMAC_CTX, md: *mut c_uchar, len: *mut c_uint) -> c_int;
+ pub fn HMAC_CTX_copy(dst: *mut HMAC_CTX, src: *mut HMAC_CTX) -> c_int;
+}

3021
lang/rust/files/patch-src_vendor_openssl-sys_src_lib.rs Normal file
View file

File diff suppressed because it is too large Load diff

639
lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_mod.rs Normal file
View file

@ -0,0 +1,639 @@
--- src/vendor/openssl-sys/src/libressl/mod.rs.orig 2018-09-11 04:49:55 UTC
+++ src/vendor/openssl-sys/src/libressl/mod.rs
@@ -1,636 +0,0 @@
-use libc::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong, c_void, size_t};
-use std::mem;
-use std::ptr;
-use std::sync::{Mutex, MutexGuard};
-use std::sync::{Once, ONCE_INIT};
-
-#[cfg(not(libressl251))]
-pub use libressl::v250::*;
-#[cfg(libressl251)]
-pub use libressl::v251::*;
-#[cfg(libressl273)]
-pub use libressl::v273::*;
-
-#[cfg(not(libressl251))]
-mod v250;
-#[cfg(libressl251)]
-mod v251;
-#[cfg(libressl273)]
-mod v273;
-
-#[repr(C)]
-pub struct stack_st_ASN1_OBJECT {
- pub stack: _STACK,
-}
-
-#[repr(C)]
-pub struct stack_st_X509 {
- pub stack: _STACK,
-}
-
-#[repr(C)]
-pub struct stack_st_X509_NAME {
- pub stack: _STACK,
-}
-
-#[repr(C)]
-pub struct stack_st_X509_ATTRIBUTE {
- pub stack: _STACK,
-}
-
-#[repr(C)]
-pub struct stack_st_X509_EXTENSION {
- pub stack: _STACK,
-}
-
-#[repr(C)]
-pub struct stack_st_GENERAL_NAME {
- pub stack: _STACK,
-}
-
-#[repr(C)]
-pub struct stack_st_void {
- pub stack: _STACK,
-}
-
-#[repr(C)]
-pub struct stack_st_SSL_CIPHER {
- pub stack: _STACK,
-}
-
-#[repr(C)]
-pub struct stack_st_OPENSSL_STRING {
- pub stack: _STACK,
-}
-
-#[repr(C)]
-pub struct _STACK {
- pub num: c_int,
- pub data: *mut *mut c_char,
- pub sorted: c_int,
- pub num_alloc: c_int,
- pub comp: Option<unsafe extern "C" fn(*const c_void, *const c_void) -> c_int>,
-}
-
-#[repr(C)]
-pub struct BIO_METHOD {
- pub type_: c_int,
- pub name: *const c_char,
- pub bwrite: Option<unsafe extern "C" fn(*mut ::BIO, *const c_char, c_int) -> c_int>,
- pub bread: Option<unsafe extern "C" fn(*mut ::BIO, *mut c_char, c_int) -> c_int>,
- pub bputs: Option<unsafe extern "C" fn(*mut ::BIO, *const c_char) -> c_int>,
- pub bgets: Option<unsafe extern "C" fn(*mut ::BIO, *mut c_char, c_int) -> c_int>,
- pub ctrl: Option<unsafe extern "C" fn(*mut ::BIO, c_int, c_long, *mut c_void) -> c_long>,
- pub create: Option<unsafe extern "C" fn(*mut ::BIO) -> c_int>,
- pub destroy: Option<unsafe extern "C" fn(*mut ::BIO) -> c_int>,
- pub callback_ctrl: Option<unsafe extern "C" fn(*mut ::BIO, c_int, ::bio_info_cb) -> c_long>,
-}
-
-#[repr(C)]
-pub struct RSA {
- pub pad: c_int,
- pub version: c_long,
- pub meth: *const ::RSA_METHOD,
-
- pub engine: *mut ::ENGINE,
- pub n: *mut ::BIGNUM,
- pub e: *mut ::BIGNUM,
- pub d: *mut ::BIGNUM,
- pub p: *mut ::BIGNUM,
- pub q: *mut ::BIGNUM,
- pub dmp1: *mut ::BIGNUM,
- pub dmq1: *mut ::BIGNUM,
- pub iqmp: *mut ::BIGNUM,
-
- pub ex_data: ::CRYPTO_EX_DATA,
- pub references: c_int,
- pub flags: c_int,
-
- pub _method_mod_n: *mut ::BN_MONT_CTX,
- pub _method_mod_p: *mut ::BN_MONT_CTX,
- pub _method_mod_q: *mut ::BN_MONT_CTX,
-
- pub blinding: *mut ::BN_BLINDING,
- pub mt_blinding: *mut ::BN_BLINDING,
-}
-
-#[repr(C)]
-pub struct DSA {
- pub pad: c_int,
- pub version: c_long,
- pub write_params: c_int,
-
- pub p: *mut ::BIGNUM,
- pub q: *mut ::BIGNUM,
- pub g: *mut ::BIGNUM,
- pub pub_key: *mut ::BIGNUM,
- pub priv_key: *mut ::BIGNUM,
- pub kinv: *mut ::BIGNUM,
- pub r: *mut ::BIGNUM,
-
- pub flags: c_int,
- pub method_mont_p: *mut ::BN_MONT_CTX,
- pub references: c_int,
- pub ex_data: ::CRYPTO_EX_DATA,
- pub meth: *const ::DSA_METHOD,
- pub engine: *mut ::ENGINE,
-}
-
-#[repr(C)]
-pub struct ECDSA_SIG {
- pub r: *mut ::BIGNUM,
- pub s: *mut ::BIGNUM,
-}
-
-#[repr(C)]
-pub struct EVP_PKEY {
- pub type_: c_int,
- pub save_type: c_int,
- pub references: c_int,
- pub ameth: *const ::EVP_PKEY_ASN1_METHOD,
- pub engine: *mut ::ENGINE,
- pub pkey: *mut c_void,
- pub save_parameters: c_int,
- pub attributes: *mut stack_st_X509_ATTRIBUTE,
-}
-
-#[repr(C)]
-pub struct BIO {
- pub method: *mut ::BIO_METHOD,
- pub callback: Option<
- unsafe extern "C" fn(*mut ::BIO, c_int, *const c_char, c_int, c_long, c_long) -> c_long,
- >,
- pub cb_arg: *mut c_char,
- pub init: c_int,
- pub shutdown: c_int,
- pub flags: c_int,
- pub retry_reason: c_int,
- pub num: c_int,
- pub ptr: *mut c_void,
- pub next_bio: *mut ::BIO,
- pub prev_bio: *mut ::BIO,
- pub references: c_int,
- pub num_read: c_ulong,
- pub num_write: c_ulong,
- pub ex_data: ::CRYPTO_EX_DATA,
-}
-
-#[repr(C)]
-pub struct CRYPTO_EX_DATA {
- pub sk: *mut ::stack_st_void,
-}
-
-#[repr(C)]
-pub struct EVP_MD_CTX {
- digest: *mut ::EVP_MD,
- engine: *mut ::ENGINE,
- flags: c_ulong,
- md_data: *mut c_void,
- pctx: *mut ::EVP_PKEY_CTX,
- update: *mut c_void,
-}
-
-#[repr(C)]
-pub struct EVP_CIPHER {
- pub nid: c_int,
- pub block_size: c_int,
- pub key_len: c_int,
- pub iv_len: c_int,
- pub flags: c_ulong,
- pub init: Option<
- unsafe extern "C" fn(*mut ::EVP_CIPHER_CTX, *const c_uchar, *const c_uchar, c_int) -> c_int,
- >,
- pub do_cipher: Option<
- unsafe extern "C" fn(*mut ::EVP_CIPHER_CTX, *mut c_uchar, *const c_uchar, size_t) -> c_int,
- >,
- pub cleanup: Option<unsafe extern "C" fn(*mut ::EVP_CIPHER_CTX) -> c_int>,
- pub ctx_size: c_int,
- pub set_asn1_parameters:
- Option<unsafe extern "C" fn(*mut ::EVP_CIPHER_CTX, *mut ::ASN1_TYPE) -> c_int>,
- pub get_asn1_parameters:
- Option<unsafe extern "C" fn(*mut ::EVP_CIPHER_CTX, *mut ::ASN1_TYPE) -> c_int>,
- pub ctrl:
- Option<unsafe extern "C" fn(*mut ::EVP_CIPHER_CTX, c_int, c_int, *mut c_void) -> c_int>,
- pub app_data: *mut c_void,
-}
-
-#[repr(C)]
-pub struct HMAC_CTX {
- md: *mut ::EVP_MD,
- md_ctx: ::EVP_MD_CTX,
- i_ctx: ::EVP_MD_CTX,
- o_ctx: ::EVP_MD_CTX,
- key_length: c_uint,
- key: [c_uchar; 128],
-}
-
-#[repr(C)]
-pub struct BIGNUM {
- pub d: *mut ::BN_ULONG,
- pub top: c_int,
- pub dmax: c_int,
- pub neg: c_int,
- pub flags: c_int,
-}
-
-#[repr(C)]
-pub struct DH {
- pub pad: c_int,
- pub version: c_int,
- pub p: *mut ::BIGNUM,
- pub g: *mut ::BIGNUM,
- pub length: c_long,
- pub pub_key: *mut ::BIGNUM,
- pub priv_key: *mut ::BIGNUM,
- pub flags: c_int,
- pub method_mont_p: *mut ::BN_MONT_CTX,
- pub q: *mut ::BIGNUM,
- pub j: *mut ::BIGNUM,
- pub seed: *mut c_uchar,
- pub seedlen: c_int,
- pub counter: *mut ::BIGNUM,
- pub references: c_int,
- pub ex_data: ::CRYPTO_EX_DATA,
- pub meth: *const ::DH_METHOD,
- pub engine: *mut ::ENGINE,
-}
-
-#[repr(C)]
-pub struct X509 {
- pub cert_info: *mut X509_CINF,
- pub sig_alg: *mut ::X509_ALGOR,
- pub signature: *mut ::ASN1_BIT_STRING,
- pub valid: c_int,
- pub references: c_int,
- pub name: *mut c_char,
- pub ex_data: ::CRYPTO_EX_DATA,
- pub ex_pathlen: c_long,
- pub ex_pcpathlen: c_long,
- pub ex_flags: c_ulong,
- pub ex_kusage: c_ulong,
- pub ex_xkusage: c_ulong,
- pub ex_nscert: c_ulong,
- skid: *mut c_void,
- akid: *mut c_void,
- policy_cache: *mut c_void,
- crldp: *mut c_void,
- altname: *mut c_void,
- nc: *mut c_void,
- #[cfg(not(osslconf = "OPENSSL_NO_SHA"))]
- sha1_hash: [c_uchar; 20],
- aux: *mut c_void,
-}
-
-#[repr(C)]
-pub struct X509_CINF {
- version: *mut c_void,
- serialNumber: *mut c_void,
- signature: *mut c_void,
- issuer: *mut c_void,
- pub validity: *mut X509_VAL,
- subject: *mut c_void,
- key: *mut c_void,
- issuerUID: *mut c_void,
- subjectUID: *mut c_void,
- pub extensions: *mut stack_st_X509_EXTENSION,
- enc: ASN1_ENCODING,
-}
-
-#[repr(C)]
-pub struct X509_ALGOR {
- pub algorithm: *mut ::ASN1_OBJECT,
- parameter: *mut c_void,
-}
-
-#[repr(C)]
-pub struct ASN1_ENCODING {
- pub enc: *mut c_uchar,
- pub len: c_long,
- pub modified: c_int,
-}
-
-#[repr(C)]
-pub struct X509_VAL {
- pub notBefore: *mut ::ASN1_TIME,
- pub notAfter: *mut ::ASN1_TIME,
-}
-
-#[repr(C)]
-pub struct X509_REQ_INFO {
- pub enc: ASN1_ENCODING,
- pub version: *mut ::ASN1_INTEGER,
- pub subject: *mut ::X509_NAME,
- pubkey: *mut c_void,
- pub attributes: *mut stack_st_X509_ATTRIBUTE,
-}
-
-#[repr(C)]
-pub struct X509_REQ {
- pub req_info: *mut X509_REQ_INFO,
- sig_alg: *mut c_void,
- signature: *mut c_void,
- references: c_int,
-}
-
-pub enum X509_VERIFY_PARAM_ID {}
-pub enum PKCS12 {}
-
-pub const SSL_CTRL_GET_SESSION_REUSED: c_int = 8;
-pub const SSL_CTRL_OPTIONS: c_int = 32;
-pub const SSL_CTRL_CLEAR_OPTIONS: c_int = 77;
-pub const SSL_CTRL_SET_ECDH_AUTO: c_int = 94;
-
-#[cfg(libressl261)]
-pub const SSL_OP_ALL: c_ulong = 0x4;
-#[cfg(not(libressl261))]
-pub const SSL_OP_ALL: c_ulong = 0x80000014;
-pub const SSL_OP_CISCO_ANYCONNECT: c_ulong = 0x0;
-pub const SSL_OP_NO_COMPRESSION: c_ulong = 0x0;
-pub const SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: c_ulong = 0x0;
-pub const SSL_OP_NO_SSLv3: c_ulong = 0x0;
-pub const SSL_OP_MICROSOFT_SESS_ID_BUG: c_ulong = 0x0;
-pub const SSL_OP_NETSCAPE_CHALLENGE_BUG: c_ulong = 0x0;
-pub const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: c_ulong = 0x0;
-pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: c_ulong = 0x0;
-pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: c_ulong = 0x0;
-pub const SSL_OP_TLS_D5_BUG: c_ulong = 0x0;
-pub const SSL_OP_TLS_BLOCK_PADDING_BUG: c_ulong = 0x0;
-#[cfg(libressl261)]
-pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x0;
-#[cfg(not(libressl261))]
-pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x00080000;
-pub const SSL_OP_SINGLE_DH_USE: c_ulong = 0x00100000;
-pub const SSL_OP_NO_SSLv2: c_ulong = 0x0;
-
-pub const SSL_MAX_SSL_SESSION_ID_LENGTH: c_int = 32;
-pub const SSL_MAX_SID_CTX_LENGTH: c_int = 32;
-pub const SSL_MAX_MASTER_KEY_LENGTH: c_int = 48;
-
-pub const SSLEAY_VERSION: c_int = 0;
-pub const SSLEAY_CFLAGS: c_int = 2;
-pub const SSLEAY_BUILT_ON: c_int = 3;
-pub const SSLEAY_PLATFORM: c_int = 4;
-pub const SSLEAY_DIR: c_int = 5;
-
-pub const CRYPTO_LOCK_X509: c_int = 3;
-pub const CRYPTO_LOCK_SSL_CTX: c_int = 12;
-pub const CRYPTO_LOCK_SSL_SESSION: c_int = 14;
-
-static mut MUTEXES: *mut Vec<Mutex<()>> = 0 as *mut Vec<Mutex<()>>;
-static mut GUARDS: *mut Vec<Option<MutexGuard<'static, ()>>> =
- 0 as *mut Vec<Option<MutexGuard<'static, ()>>>;
-
-unsafe extern "C" fn locking_function(mode: c_int, n: c_int, _file: *const c_char, _line: c_int) {
- let mutex = &(*MUTEXES)[n as usize];
-
- if mode & ::CRYPTO_LOCK != 0 {
- (*GUARDS)[n as usize] = Some(mutex.lock().unwrap());
- } else {
- &(*GUARDS)[n as usize].take().expect("lock already unlocked");
- }
-}
-
-pub fn init() {
- static INIT: Once = ONCE_INIT;
-
- INIT.call_once(|| unsafe {
- SSL_library_init();
- SSL_load_error_strings();
- OPENSSL_add_all_algorithms_noconf();
-
- let num_locks = ::CRYPTO_num_locks();
- let mut mutexes = Box::new(Vec::new());
- for _ in 0..num_locks {
- mutexes.push(Mutex::new(()));
- }
- MUTEXES = mem::transmute(mutexes);
- let guards: Box<Vec<Option<MutexGuard<()>>>> =
- Box::new((0..num_locks).map(|_| None).collect());
- GUARDS = mem::transmute(guards);
-
- CRYPTO_set_locking_callback(locking_function);
- set_id_callback();
- })
-}
-
-#[cfg(unix)]
-fn set_id_callback() {
- unsafe extern "C" fn thread_id() -> c_ulong {
- ::libc::pthread_self() as c_ulong
- }
-
- unsafe {
- CRYPTO_set_id_callback(thread_id);
- }
-}
-
-#[cfg(not(unix))]
-fn set_id_callback() {}
-
-// macros
-
-pub unsafe fn SSL_CTX_set_ecdh_auto(ctx: *mut SSL_CTX, onoff: c_int) -> c_int {
- ::SSL_CTX_ctrl(
- ctx,
- SSL_CTRL_SET_ECDH_AUTO,
- onoff as c_long,
- ptr::null_mut(),
- ) as c_int
-}
-
-pub unsafe fn SSL_set_ecdh_auto(ssl: *mut ::SSL, onoff: c_int) -> c_int {
- ::SSL_ctrl(
- ssl,
- SSL_CTRL_SET_ECDH_AUTO,
- onoff as c_long,
- ptr::null_mut(),
- ) as c_int
-}
-
-pub unsafe fn SSL_session_reused(ssl: *mut ::SSL) -> c_int {
- ::SSL_ctrl(ssl, SSL_CTRL_GET_SESSION_REUSED, 0, ptr::null_mut()) as c_int
-}
-
-pub unsafe fn SSL_CTX_get_options(ctx: *const ::SSL_CTX) -> c_ulong {
- ::SSL_CTX_ctrl(ctx as *mut _, ::SSL_CTRL_OPTIONS, 0, ptr::null_mut()) as c_ulong
-}
-
-pub unsafe fn SSL_CTX_set_options(ctx: *const ::SSL_CTX, op: c_ulong) -> c_ulong {
- ::SSL_CTX_ctrl(
- ctx as *mut _,
- ::SSL_CTRL_OPTIONS,
- op as c_long,
- ptr::null_mut(),
- ) as c_ulong
-}
-
-pub unsafe fn SSL_CTX_clear_options(ctx: *const ::SSL_CTX, op: c_ulong) -> c_ulong {
- ::SSL_CTX_ctrl(
- ctx as *mut _,
- ::SSL_CTRL_CLEAR_OPTIONS,
- op as c_long,
- ptr::null_mut(),
- ) as c_ulong
-}
-
-extern "C" {
- pub fn BIO_new(type_: *mut BIO_METHOD) -> *mut BIO;
- pub fn BIO_s_file() -> *mut BIO_METHOD;
- pub fn BIO_s_mem() -> *mut BIO_METHOD;
-
- pub fn get_rfc2409_prime_768(bn: *mut BIGNUM) -> *mut BIGNUM;
- pub fn get_rfc2409_prime_1024(bn: *mut BIGNUM) -> *mut BIGNUM;
- pub fn get_rfc3526_prime_1536(bn: *mut BIGNUM) -> *mut BIGNUM;
- pub fn get_rfc3526_prime_2048(bn: *mut BIGNUM) -> *mut BIGNUM;
- pub fn get_rfc3526_prime_3072(bn: *mut BIGNUM) -> *mut BIGNUM;
- pub fn get_rfc3526_prime_4096(bn: *mut BIGNUM) -> *mut BIGNUM;
- pub fn get_rfc3526_prime_6144(bn: *mut BIGNUM) -> *mut BIGNUM;
- pub fn get_rfc3526_prime_8192(bn: *mut BIGNUM) -> *mut BIGNUM;
-
- pub fn CRYPTO_malloc(num: c_int, file: *const c_char, line: c_int) -> *mut c_void;
- pub fn CRYPTO_free(buf: *mut c_void);
- pub fn CRYPTO_num_locks() -> c_int;
- pub fn CRYPTO_set_locking_callback(
- func: unsafe extern "C" fn(mode: c_int, n: c_int, file: *const c_char, line: c_int),
- );
- pub fn CRYPTO_set_id_callback(func: unsafe extern "C" fn() -> c_ulong);
-
- pub fn ERR_load_crypto_strings();
-
- pub fn RSA_generate_key(
- modsz: c_int,
- e: c_ulong,
- cb: Option<extern "C" fn(c_int, c_int, *mut c_void)>,
- cbarg: *mut c_void,
- ) -> *mut RSA;
-
- pub fn OCSP_cert_to_id(
- dgst: *const ::EVP_MD,
- subject: *mut ::X509,
- issuer: *mut ::X509,
- ) -> *mut ::OCSP_CERTID;
-
- pub fn PKCS12_create(
- pass: *mut c_char,
- friendly_name: *mut c_char,
- pkey: *mut EVP_PKEY,
- cert: *mut X509,
- ca: *mut stack_st_X509,
- nid_key: c_int,
- nid_cert: c_int,
- iter: c_int,
- mac_iter: c_int,
- keytype: c_int,
- ) -> *mut PKCS12;
-
- pub fn SSL_library_init() -> c_int;
- pub fn SSL_load_error_strings();
- pub fn OPENSSL_add_all_algorithms_noconf();
- pub fn HMAC_CTX_init(ctx: *mut ::HMAC_CTX);
- pub fn HMAC_CTX_cleanup(ctx: *mut ::HMAC_CTX);
- pub fn TLSv1_method() -> *const ::SSL_METHOD;
- pub fn SSLv23_method() -> *const ::SSL_METHOD;
- pub fn TLSv1_1_method() -> *const ::SSL_METHOD;
- pub fn TLSv1_2_method() -> *const ::SSL_METHOD;
- pub fn DTLSv1_method() -> *const ::SSL_METHOD;
- pub fn SSL_get_ex_new_index(
- argl: c_long,
- argp: *mut c_void,
- new_func: Option<::CRYPTO_EX_new>,
- dup_func: Option<::CRYPTO_EX_dup>,
- free_func: Option<::CRYPTO_EX_free>,
- ) -> c_int;
- pub fn SSL_set_tmp_ecdh_callback(
- ssl: *mut ::SSL,
- ecdh: unsafe extern "C" fn(ssl: *mut ::SSL, is_export: c_int, keylength: c_int)
- -> *mut ::EC_KEY,
- );
- pub fn SSL_CIPHER_get_version(cipher: *const ::SSL_CIPHER) -> *mut c_char;
- pub fn SSL_CTX_get_ex_new_index(
- argl: c_long,
- argp: *mut c_void,
- new_func: Option<::CRYPTO_EX_new>,
- dup_func: Option<::CRYPTO_EX_dup>,
- free_func: Option<::CRYPTO_EX_free>,
- ) -> c_int;
- // FIXME should take an option
- pub fn SSL_CTX_set_tmp_ecdh_callback(
- ctx: *mut ::SSL_CTX,
- ecdh: unsafe extern "C" fn(ssl: *mut ::SSL, is_export: c_int, keylength: c_int)
- -> *mut ::EC_KEY,
- );
- pub fn SSL_CTX_sess_set_get_cb(
- ctx: *mut ::SSL_CTX,
- get_session_cb: Option<
- unsafe extern "C" fn(*mut ::SSL, *mut c_uchar, c_int, *mut c_int) -> *mut SSL_SESSION,
- >,
- );
- #[cfg(libressl261)]
- pub fn SSL_CTX_set_min_proto_version(ctx: *mut ::SSL_CTX, version: u16) -> c_int;
- #[cfg(libressl261)]
- pub fn SSL_CTX_set_max_proto_version(ctx: *mut ::SSL_CTX, version: u16) -> c_int;
- #[cfg(libressl270)]
- pub fn SSL_CTX_get_min_proto_version(ctx: *mut ::SSL_CTX) -> c_int;
- #[cfg(libressl270)]
- pub fn SSL_CTX_get_max_proto_version(ctx: *mut ::SSL_CTX) -> c_int;
-
- pub fn X509_get_subject_name(x: *mut ::X509) -> *mut ::X509_NAME;
- pub fn X509_get_issuer_name(x: *mut ::X509) -> *mut ::X509_NAME;
- pub fn X509_set_notAfter(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int;
- pub fn X509_set_notBefore(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int;
- pub fn X509_get_ext_d2i(
- x: *mut ::X509,
- nid: c_int,
- crit: *mut c_int,
- idx: *mut c_int,
- ) -> *mut c_void;
- pub fn X509_NAME_add_entry_by_NID(
- x: *mut ::X509_NAME,
- field: c_int,
- ty: c_int,
- bytes: *mut c_uchar,
- len: c_int,
- loc: c_int,
- set: c_int,
- ) -> c_int;
- pub fn X509_NAME_entry_count(n: *mut ::X509_NAME) -> c_int;
- pub fn X509_NAME_get_entry(n: *mut ::X509_NAME, loc: c_int) -> *mut ::X509_NAME_ENTRY;
- pub fn X509_NAME_ENTRY_get_data(ne: *mut ::X509_NAME_ENTRY) -> *mut ::ASN1_STRING;
- pub fn X509_NAME_ENTRY_get_object(ne: *mut ::X509_NAME_ENTRY) -> *mut ::ASN1_OBJECT;
- pub fn X509_STORE_CTX_get_chain(ctx: *mut ::X509_STORE_CTX) -> *mut stack_st_X509;
- pub fn X509V3_EXT_nconf_nid(
- conf: *mut ::CONF,
- ctx: *mut ::X509V3_CTX,
- ext_nid: c_int,
- value: *mut c_char,
- ) -> *mut ::X509_EXTENSION;
- pub fn X509V3_EXT_nconf(
- conf: *mut ::CONF,
- ctx: *mut ::X509V3_CTX,
- name: *mut c_char,
- value: *mut c_char,
- ) -> *mut ::X509_EXTENSION;
- pub fn ASN1_STRING_to_UTF8(out: *mut *mut c_uchar, s: *mut ::ASN1_STRING) -> c_int;
- pub fn ASN1_STRING_data(x: *mut ::ASN1_STRING) -> *mut c_uchar;
- pub fn CRYPTO_add_lock(
- pointer: *mut c_int,
- amount: c_int,
- type_: c_int,
- file: *const c_char,
- line: c_int,
- ) -> c_int;
- pub fn EVP_MD_CTX_create() -> *mut EVP_MD_CTX;
- pub fn EVP_MD_CTX_destroy(ctx: *mut EVP_MD_CTX);
- pub fn EVP_PKEY_bits(key: *mut EVP_PKEY) -> c_int;
-
- pub fn sk_new_null() -> *mut _STACK;
- pub fn sk_num(st: *const _STACK) -> c_int;
- pub fn sk_value(st: *const _STACK, n: c_int) -> *mut c_void;
- pub fn sk_free(st: *mut _STACK);
- pub fn sk_push(st: *mut _STACK, data: *mut c_void) -> c_int;
- pub fn sk_pop_free(st: *mut _STACK, free: Option<unsafe extern "C" fn(*mut c_void)>);
- pub fn sk_pop(st: *mut _STACK) -> *mut c_void;
-
- pub fn SSLeay() -> c_ulong;
- pub fn SSLeay_version(key: c_int) -> *const c_char;
-}

224
lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_v250.rs Normal file
View file

@ -0,0 +1,224 @@
--- src/vendor/openssl-sys/src/libressl/v250.rs.orig 2018-09-11 04:49:55 UTC
+++ src/vendor/openssl-sys/src/libressl/v250.rs
@@ -1,221 +0,0 @@
-use libc::{c_int, c_char, c_void, c_long, c_uchar, size_t, c_uint, c_ulong, time_t};
-
-use super::*;
-
-#[repr(C)]
-pub struct SSL {
- version: c_int,
- type_: c_int,
- method: *const ::SSL_METHOD,
- rbio: *mut c_void,
- wbio: *mut c_void,
- bbio: *mut c_void,
- rwstate: c_int,
- in_handshake: c_int,
- handshake_func: Option<unsafe extern "C" fn(*mut SSL) -> c_int>,
- pub server: c_int,
- new_session: c_int,
- quiet_shutdown: c_int,
- shutdown: c_int,
- state: c_int,
- rstate: c_int,
- init_buf: *mut c_void,
- init_msg: *mut c_void,
- init_num: c_int,
- init_off: c_int,
- packet: *mut c_uchar,
- packet_length: c_uint,
- s3: *mut c_void,
- d1: *mut c_void,
- read_ahead: c_int,
- msg_callback: Option<
- unsafe extern "C" fn(c_int,
- c_int,
- c_int,
- *const c_void,
- size_t,
- *mut SSL,
- *mut c_void),
- >,
- msg_callback_arg: *mut c_void,
- hit: c_int,
- param: *mut c_void,
- cipher_list: *mut stack_st_SSL_CIPHER,
- cipher_list_by_id: *mut stack_st_SSL_CIPHER,
- mac_flags: c_int,
- aead_read_ctx: *mut c_void,
- enc_read_ctx: *mut ::EVP_CIPHER_CTX,
- read_hash: *mut ::EVP_MD_CTX,
- aead_write_ctx: *mut c_void,
- enc_write_ctx: *mut ::EVP_CIPHER_CTX,
- write_hash: *mut ::EVP_MD_CTX,
- cert: *mut c_void,
- sid_ctx_length: c_uint,
- sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize],
- session: *mut ::SSL_SESSION,
- generate_session_id: ::GEN_SESSION_CB,
- verify_mode: c_int,
- verify_callback: Option<unsafe extern "C" fn(c_int, *mut ::X509_STORE_CTX) -> c_int>,
- info_callback: Option<unsafe extern "C" fn(*mut SSL, c_int, c_int)>,
- error: c_int,
- error_code: c_int,
- ctx: *mut ::SSL_CTX,
- debug: c_int,
- verify_result: c_long,
- ex_data: ::CRYPTO_EX_DATA,
- client_CA: *mut stack_st_X509_NAME,
- references: c_int,
- options: c_ulong,
- mode: c_ulong,
- max_cert_list: c_long,
- first_packet: c_int,
- client_version: c_int,
- max_send_fragment: c_uint,
- tlsext_debug_cb:
- Option<unsafe extern "C" fn(*mut SSL, c_int, c_int, *mut c_uchar, c_int, *mut c_void)>,
- tlsext_debug_arg: *mut c_void,
- tlsext_hostname: *mut c_char,
- servername_done: c_int,
- tlsext_status_type: c_int,
- tlsext_status_expected: c_int,
- tlsext_ocsp_ids: *mut c_void,
- tlsext_ocsp_exts: *mut c_void,
- tlsext_ocsp_resp: *mut c_uchar,
- tlsext_ocsp_resplen: c_int,
- tlsext_ticket_expected: c_int,
- tlsext_ecpointformatlist_length: size_t,
- tlsext_ecpointformatlist: *mut c_uchar,
- tlsext_ellipticcurvelist_length: size_t,
- tlsext_ellipticcurvelist: *mut c_uchar,
- tlsext_session_ticket: *mut c_void,
- tlsext_session_ticket_ext_cb: ::tls_session_ticket_ext_cb_fn,
- tls_session_ticket_ext_cb_arg: *mut c_void,
- tls_session_secret_cb: ::tls_session_secret_cb_fn,
- tls_session_secret_cb_arg: *mut c_void,
- initial_ctx: *mut ::SSL_CTX,
- next_proto_negotiated: *mut c_uchar,
- next_proto_negotiated_len: c_uchar,
- srtp_profiles: *mut c_void,
- srtp_profile: *mut c_void,
- tlsext_heartbeat: c_uint,
- tlsext_hb_pending: c_uint,
- tlsext_hb_seq: c_uint,
- alpn_client_proto_list: *mut c_uchar,
- alpn_client_proto_list_len: c_uint,
- renegotiate: c_int,
-}
-
-#[repr(C)]
-pub struct SSL_CTX {
- method: *mut c_void,
- cipher_list: *mut c_void,
- cipher_list_by_id: *mut c_void,
- cert_store: *mut c_void,
- sessions: *mut c_void,
- session_cache_size: c_ulong,
- session_cache_head: *mut c_void,
- session_cache_tail: *mut c_void,
- session_cache_mode: c_int,
- session_timeout: c_long,
- new_session_cb: *mut c_void,
- remove_session_cb: *mut c_void,
- get_session_cb: *mut c_void,
- stats: [c_int; 11],
- pub references: c_int,
- app_verify_callback: *mut c_void,
- app_verify_arg: *mut c_void,
- default_passwd_callback: *mut c_void,
- default_passwd_callback_userdata: *mut c_void,
- client_cert_cb: *mut c_void,
- app_gen_cookie_cb: *mut c_void,
- app_verify_cookie_cb: *mut c_void,
- ex_dat: ::CRYPTO_EX_DATA,
- rsa_md5: *mut c_void,
- md5: *mut c_void,
- sha1: *mut c_void,
- extra_certs: *mut c_void,
- comp_methods: *mut c_void,
- info_callback: *mut c_void,
- client_CA: *mut c_void,
- options: c_ulong,
- mode: c_ulong,
- max_cert_list: c_long,
- cert: *mut c_void,
- read_ahead: c_int,
- msg_callback: *mut c_void,
- msg_callback_arg: *mut c_void,
- verify_mode: c_int,
- sid_ctx_length: c_uint,
- sid_ctx: [c_uchar; 32],
- default_verify_callback: *mut c_void,
- generate_session_id: *mut c_void,
- param: *mut c_void,
- quiet_shutdown: c_int,
- max_send_fragment: c_uint,
-
- #[cfg(not(osslconf = "OPENSSL_NO_ENGINE"))]
- client_cert_engine: *mut c_void,
-
- tlsext_servername_callback: *mut c_void,
- tlsect_servername_arg: *mut c_void,
- tlsext_tick_key_name: [c_uchar; 16],
- tlsext_tick_hmac_key: [c_uchar; 16],
- tlsext_tick_aes_key: [c_uchar; 16],
- tlsext_ticket_key_cb: *mut c_void,
- tlsext_status_cb: *mut c_void,
- tlsext_status_arg: *mut c_void,
- tlsext_opaque_prf_input_callback: *mut c_void,
- tlsext_opaque_prf_input_callback_arg: *mut c_void,
-
- next_protos_advertised_cb: *mut c_void,
- next_protos_advertised_cb_arg: *mut c_void,
- next_proto_select_cb: *mut c_void,
- next_proto_select_cb_arg: *mut c_void,
-
- srtp_profiles: *mut c_void,
-}
-
-#[repr(C)]
-pub struct SSL_SESSION {
- ssl_version: c_int,
- pub master_key_length: c_int,
- pub master_key: [c_uchar; 48],
- session_id_length: c_uint,
- session_id: [c_uchar; SSL_MAX_SSL_SESSION_ID_LENGTH as usize],
- sid_ctx_length: c_uint,
- sid_ctx: [c_uchar; SSL_MAX_SID_CTX_LENGTH as usize],
- not_resumable: c_int,
- sess_cert: *mut c_void,
- peer: *mut X509,
- verify_result: c_long,
- timeout: c_long,
- time: time_t,
- pub references: c_int,
- cipher: *const c_void,
- cipher_id: c_ulong,
- ciphers: *mut c_void,
- ex_data: ::CRYPTO_EX_DATA,
- prev: *mut c_void,
- next: *mut c_void,
- tlsext_hostname: *mut c_char,
- tlsext_ecpointformatlist_length: size_t,
- tlsext_ecpointformatlist: *mut u8,
- tlsext_ellipticcurvelist_length: size_t,
- tlsext_ellipticcurvelist: *mut u16,
- tlsext_tick: *mut c_uchar,
- tlsext_ticklen: size_t,
- tlsext_tick_lifetime_hint: c_long,
-}
-
-#[repr(C)]
-pub struct X509_VERIFY_PARAM {
- pub name: *mut c_char,
- pub check_time: time_t,
- pub inh_flags: c_ulong,
- pub flags: c_ulong,
- pub purpose: c_int,
- pub trust: c_int,
- pub depth: c_int,
- pub policies: *mut stack_st_ASN1_OBJECT,
- //pub id: *mut X509_VERIFY_PARAM_ID,
-}

92
lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_v251.rs Normal file
View file

@ -0,0 +1,92 @@
--- src/vendor/openssl-sys/src/libressl/v251.rs.orig 2018-09-11 04:49:55 UTC
+++ src/vendor/openssl-sys/src/libressl/v251.rs
@@ -1,89 +0,0 @@
-use libc::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong, c_void, size_t, time_t};
-
-use super::*;
-
-#[repr(C)]
-pub struct SSL {
- version: c_int,
- method: *const ::SSL_METHOD,
- rbio: *mut ::BIO,
- wbio: *mut ::BIO,
- bbio: *mut ::BIO,
- pub server: c_int,
- s3: *mut c_void,
- d1: *mut c_void,
- param: *mut c_void,
- cipher_list: *mut stack_st_SSL_CIPHER,
- cert: *mut c_void,
- sid_ctx_length: c_uint,
- sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize],
- session: *mut ::SSL_SESSION,
- verify_mode: c_int,
- error: c_int,
- error_code: c_int,
- ctx: *mut ::SSL_CTX,
- verify_result: c_long,
- references: c_int,
- client_version: c_int,
- max_send_fragment: c_uint,
- tlsext_hostname: *mut c_char,
- tlsext_status_type: c_int,
- initial_ctx: *mut ::SSL_CTX,
- enc_read_ctx: *mut ::EVP_CIPHER_CTX,
- read_hash: *mut EVP_MD_CTX,
- internal: *mut c_void,
-}
-
-#[repr(C)]
-pub struct SSL_CTX {
- method: *const ::SSL_METHOD,
- cipher_list: *mut stack_st_SSL_CIPHER,
- cert_store: *mut c_void,
- session_timeout: c_long,
- pub references: c_int,
- extra_certs: *mut stack_st_X509,
- verify_mode: c_int,
- sid_ctx_length: c_uint,
- sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize],
- param: *mut ::X509_VERIFY_PARAM,
- default_passwd_callback: *mut c_void,
- default_passwd_callback_userdata: *mut c_void,
- internal: *mut c_void,
-}
-
-#[repr(C)]
-pub struct SSL_SESSION {
- ssl_version: c_int,
- pub master_key_length: c_int,
- pub master_key: [c_uchar; 48],
- session_id_length: c_uint,
- session_id: [c_uchar; ::SSL_MAX_SSL_SESSION_ID_LENGTH as usize],
- sid_ctx_length: c_uint,
- sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize],
- peer: *mut ::X509,
- verify_result: c_long,
- timeout: c_long,
- time: time_t,
- pub references: c_int,
- cipher: *const ::SSL_CIPHER,
- cipher_id: c_long,
- ciphers: *mut stack_st_SSL_CIPHER,
- tlsext_hostname: *mut c_char,
- tlsext_tick: *mut c_uchar,
- tlsext_ticklen: size_t,
- tlsext_tick_lifetime_int: c_long,
- internal: *mut c_void,
-}
-
-#[repr(C)]
-pub struct X509_VERIFY_PARAM {
- pub name: *mut c_char,
- pub check_time: time_t,
- pub inh_flags: c_ulong,
- pub flags: c_ulong,
- pub purpose: c_int,
- pub trust: c_int,
- pub depth: c_int,
- pub policies: *mut stack_st_ASN1_OBJECT,
- id: *mut c_void,
-}

125
lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_v273.rs Normal file
View file

@ -0,0 +1,125 @@
--- src/vendor/openssl-sys/src/libressl/v273.rs.orig 2018-09-11 04:49:55 UTC
+++ src/vendor/openssl-sys/src/libressl/v273.rs
@@ -1,122 +0,0 @@
-use libc::{c_char, c_int, c_long, c_uchar, c_void, size_t};
-
-extern "C" {
- pub fn ASN1_STRING_get0_data(x: *const ::ASN1_STRING) -> *const c_uchar;
-
- pub fn BIO_set_init(a: *mut ::BIO, init: c_int);
- pub fn BIO_set_data(a: *mut ::BIO, data: *mut c_void);
- pub fn BIO_get_data(a: *mut ::BIO) -> *mut c_void;
- pub fn BIO_meth_new(type_: c_int, name: *const c_char) -> *mut ::BIO_METHOD;
- pub fn BIO_meth_free(biom: *mut ::BIO_METHOD);
- // FIXME should wrap in Option
- pub fn BIO_meth_set_write(
- biom: *mut ::BIO_METHOD,
- write: unsafe extern "C" fn(*mut ::BIO, *const c_char, c_int) -> c_int,
- ) -> c_int;
- pub fn BIO_meth_set_read(
- biom: *mut ::BIO_METHOD,
- read: unsafe extern "C" fn(*mut ::BIO, *mut c_char, c_int) -> c_int,
- ) -> c_int;
- pub fn BIO_meth_set_puts(
- biom: *mut ::BIO_METHOD,
- read: unsafe extern "C" fn(*mut ::BIO, *const c_char) -> c_int,
- ) -> c_int;
- pub fn BIO_meth_set_ctrl(
- biom: *mut ::BIO_METHOD,
- read: unsafe extern "C" fn(*mut ::BIO, c_int, c_long, *mut c_void) -> c_long,
- ) -> c_int;
- pub fn BIO_meth_set_create(
- biom: *mut ::BIO_METHOD,
- create: unsafe extern "C" fn(*mut ::BIO) -> c_int,
- ) -> c_int;
- pub fn BIO_meth_set_destroy(
- biom: *mut ::BIO_METHOD,
- destroy: unsafe extern "C" fn(*mut ::BIO) -> c_int,
- ) -> c_int;
-
- pub fn DH_set0_pqg(
- dh: *mut ::DH,
- p: *mut ::BIGNUM,
- q: *mut ::BIGNUM,
- g: *mut ::BIGNUM,
- ) -> c_int;
-
- pub fn DSA_get0_pqg(
- d: *const ::DSA,
- p: *mut *const ::BIGNUM,
- q: *mut *const ::BIGNUM,
- q: *mut *const ::BIGNUM,
- );
- pub fn DSA_set0_pqg(
- d: *mut ::DSA,
- p: *mut ::BIGNUM,
- q: *mut ::BIGNUM,
- q: *mut ::BIGNUM,
- ) -> c_int;
- pub fn DSA_get0_key(
- d: *const ::DSA,
- pub_key: *mut *const ::BIGNUM,
- priv_key: *mut *const ::BIGNUM,
- );
- pub fn DSA_set0_key(
- d: *mut ::DSA,
- pub_key: *mut ::BIGNUM,
- priv_key: *mut ::BIGNUM,
- ) -> c_int;
-
- pub fn ECDSA_SIG_get0(
- sig: *const ::ECDSA_SIG,
- pr: *mut *const ::BIGNUM,
- ps: *mut *const ::BIGNUM,
- );
- pub fn ECDSA_SIG_set0(sig: *mut ::ECDSA_SIG, pr: *mut ::BIGNUM, ps: *mut ::BIGNUM) -> c_int;
-
- pub fn EVP_CIPHER_key_length(cipher: *const ::EVP_CIPHER) -> c_int;
- pub fn EVP_CIPHER_block_size(cipher: *const ::EVP_CIPHER) -> c_int;
- pub fn EVP_CIPHER_iv_length(cipher: *const ::EVP_CIPHER) -> c_int;
-
- pub fn RSA_get0_key(
- r: *const ::RSA,
- n: *mut *const ::BIGNUM,
- e: *mut *const ::BIGNUM,
- d: *mut *const ::BIGNUM,
- );
- pub fn RSA_get0_factors(r: *const ::RSA, p: *mut *const ::BIGNUM, q: *mut *const ::BIGNUM);
- pub fn RSA_get0_crt_params(
- r: *const ::RSA,
- dmp1: *mut *const ::BIGNUM,
- dmq1: *mut *const ::BIGNUM,
- iqmp: *mut *const ::BIGNUM,
- );
- pub fn RSA_set0_key(
- r: *mut ::RSA,
- n: *mut ::BIGNUM,
- e: *mut ::BIGNUM,
- d: *mut ::BIGNUM,
- ) -> c_int;
- pub fn RSA_set0_factors(r: *mut ::RSA, p: *mut ::BIGNUM, q: *mut ::BIGNUM) -> c_int;
- pub fn RSA_set0_crt_params(
- r: *mut ::RSA,
- dmp1: *mut ::BIGNUM,
- dmq1: *mut ::BIGNUM,
- iqmp: *mut ::BIGNUM,
- ) -> c_int;
-
- pub fn SSL_CTX_up_ref(x: *mut ::SSL_CTX) -> c_int;
-
- pub fn SSL_SESSION_get_master_key(
- session: *const ::SSL_SESSION,
- out: *mut c_uchar,
- outlen: size_t,
- ) -> size_t;
- pub fn SSL_SESSION_up_ref(ses: *mut ::SSL_SESSION) -> c_int;
-
- pub fn X509_getm_notAfter(x: *const ::X509) -> *mut ::ASN1_TIME;
- pub fn X509_getm_notBefore(x: *const ::X509) -> *mut ::ASN1_TIME;
- pub fn X509_get0_signature(
- psig: *mut *const ::ASN1_BIT_STRING,
- palg: *mut *const ::X509_ALGOR,
- x: *const ::X509,
- );
- pub fn X509_up_ref(x: *mut ::X509) -> c_int;
-}

72
lang/rust/files/patch-src_vendor_openssl-sys_src_macros.rs Normal file
View file

@ -0,0 +1,72 @@
--- src/vendor/openssl-sys/src/macros.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/macros.rs
@@ -0,0 +1,69 @@
+// vendored from the cfg-if crate to avoid breaking ctest
+macro_rules! cfg_if {
+ // match if/else chains with a final `else`
+ ($(
+ if #[cfg($($meta:meta),*)] { $($it:item)* }
+ ) else * else {
+ $($it2:item)*
+ }) => {
+ cfg_if! {
+ @__items
+ () ;
+ $( ( ($($meta),*) ($($it)*) ), )*
+ ( () ($($it2)*) ),
+ }
+ };
+
+ // match if/else chains lacking a final `else`
+ (
+ if #[cfg($($i_met:meta),*)] { $($i_it:item)* }
+ $(
+ else if #[cfg($($e_met:meta),*)] { $($e_it:item)* }
+ )*
+ ) => {
+ cfg_if! {
+ @__items
+ () ;
+ ( ($($i_met),*) ($($i_it)*) ),
+ $( ( ($($e_met),*) ($($e_it)*) ), )*
+ ( () () ),
+ }
+ };
+
+ // Internal and recursive macro to emit all the items
+ //
+ // Collects all the negated cfgs in a list at the beginning and after the
+ // semicolon is all the remaining items
+ (@__items ($($not:meta,)*) ; ) => {};
+ (@__items ($($not:meta,)*) ; ( ($($m:meta),*) ($($it:item)*) ), $($rest:tt)*) => {
+ // Emit all items within one block, applying an approprate #[cfg]. The
+ // #[cfg] will require all `$m` matchers specified and must also negate
+ // all previous matchers.
+ cfg_if! { @__apply cfg(all($($m,)* not(any($($not),*)))), $($it)* }
+
+ // Recurse to emit all other items in `$rest`, and when we do so add all
+ // our `$m` matchers to the list of `$not` matchers as future emissions
+ // will have to negate everything we just matched as well.
+ cfg_if! { @__items ($($not,)* $($m,)*) ; $($rest)* }
+ };
+
+ // Internal macro to Apply a cfg attribute to a list of items
+ (@__apply $m:meta, $($it:item)*) => {
+ $(#[$m] $it)*
+ };
+}
+
+macro_rules! stack {
+ ($t:ident) => {
+ cfg_if! {
+ if #[cfg(ossl110)] {
+ pub enum $t {}
+ } else {
+ #[repr(C)]
+ pub struct $t {
+ pub stack: ::_STACK,
+ }
+ }
+ }
+ }
+}

917
lang/rust/files/patch-src_vendor_openssl-sys_src_obj__mac.rs Normal file
View file

@ -0,0 +1,917 @@
--- src/vendor/openssl-sys/src/obj_mac.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/obj_mac.rs
@@ -0,0 +1,914 @@
+use libc::*;
+
+pub const NID_undef: c_int = 0;
+pub const NID_itu_t: c_int = 645;
+pub const NID_ccitt: c_int = 404;
+pub const NID_iso: c_int = 181;
+pub const NID_joint_iso_itu_t: c_int = 646;
+pub const NID_joint_iso_ccitt: c_int = 393;
+pub const NID_member_body: c_int = 182;
+pub const NID_identified_organization: c_int = 676;
+pub const NID_hmac_md5: c_int = 780;
+pub const NID_hmac_sha1: c_int = 781;
+pub const NID_certicom_arc: c_int = 677;
+pub const NID_international_organizations: c_int = 647;
+pub const NID_wap: c_int = 678;
+pub const NID_wap_wsg: c_int = 679;
+pub const NID_selected_attribute_types: c_int = 394;
+pub const NID_clearance: c_int = 395;
+pub const NID_ISO_US: c_int = 183;
+pub const NID_X9_57: c_int = 184;
+pub const NID_X9cm: c_int = 185;
+pub const NID_dsa: c_int = 116;
+pub const NID_dsaWithSHA1: c_int = 113;
+pub const NID_ansi_X9_62: c_int = 405;
+pub const NID_X9_62_prime_field: c_int = 406;
+pub const NID_X9_62_characteristic_two_field: c_int = 407;
+pub const NID_X9_62_id_characteristic_two_basis: c_int = 680;
+pub const NID_X9_62_onBasis: c_int = 681;
+pub const NID_X9_62_tpBasis: c_int = 682;
+pub const NID_X9_62_ppBasis: c_int = 683;
+pub const NID_X9_62_id_ecPublicKey: c_int = 408;
+pub const NID_X9_62_c2pnb163v1: c_int = 684;
+pub const NID_X9_62_c2pnb163v2: c_int = 685;
+pub const NID_X9_62_c2pnb163v3: c_int = 686;
+pub const NID_X9_62_c2pnb176v1: c_int = 687;
+pub const NID_X9_62_c2tnb191v1: c_int = 688;
+pub const NID_X9_62_c2tnb191v2: c_int = 689;
+pub const NID_X9_62_c2tnb191v3: c_int = 690;
+pub const NID_X9_62_c2onb191v4: c_int = 691;
+pub const NID_X9_62_c2onb191v5: c_int = 692;
+pub const NID_X9_62_c2pnb208w1: c_int = 693;
+pub const NID_X9_62_c2tnb239v1: c_int = 694;
+pub const NID_X9_62_c2tnb239v2: c_int = 695;
+pub const NID_X9_62_c2tnb239v3: c_int = 696;
+pub const NID_X9_62_c2onb239v4: c_int = 697;
+pub const NID_X9_62_c2onb239v5: c_int = 698;
+pub const NID_X9_62_c2pnb272w1: c_int = 699;
+pub const NID_X9_62_c2pnb304w1: c_int = 700;
+pub const NID_X9_62_c2tnb359v1: c_int = 701;
+pub const NID_X9_62_c2pnb368w1: c_int = 702;
+pub const NID_X9_62_c2tnb431r1: c_int = 703;
+pub const NID_X9_62_prime192v1: c_int = 409;
+pub const NID_X9_62_prime192v2: c_int = 410;
+pub const NID_X9_62_prime192v3: c_int = 411;
+pub const NID_X9_62_prime239v1: c_int = 412;
+pub const NID_X9_62_prime239v2: c_int = 413;
+pub const NID_X9_62_prime239v3: c_int = 414;
+pub const NID_X9_62_prime256v1: c_int = 415;
+pub const NID_ecdsa_with_SHA1: c_int = 416;
+pub const NID_ecdsa_with_Recommended: c_int = 791;
+pub const NID_ecdsa_with_Specified: c_int = 792;
+pub const NID_ecdsa_with_SHA224: c_int = 793;
+pub const NID_ecdsa_with_SHA256: c_int = 794;
+pub const NID_ecdsa_with_SHA384: c_int = 795;
+pub const NID_ecdsa_with_SHA512: c_int = 796;
+pub const NID_secp112r1: c_int = 704;
+pub const NID_secp112r2: c_int = 705;
+pub const NID_secp128r1: c_int = 706;
+pub const NID_secp128r2: c_int = 707;
+pub const NID_secp160k1: c_int = 708;
+pub const NID_secp160r1: c_int = 709;
+pub const NID_secp160r2: c_int = 710;
+pub const NID_secp192k1: c_int = 711;
+pub const NID_secp224k1: c_int = 712;
+pub const NID_secp224r1: c_int = 713;
+pub const NID_secp256k1: c_int = 714;
+pub const NID_secp384r1: c_int = 715;
+pub const NID_secp521r1: c_int = 716;
+pub const NID_sect113r1: c_int = 717;
+pub const NID_sect113r2: c_int = 718;
+pub const NID_sect131r1: c_int = 719;
+pub const NID_sect131r2: c_int = 720;
+pub const NID_sect163k1: c_int = 721;
+pub const NID_sect163r1: c_int = 722;
+pub const NID_sect163r2: c_int = 723;
+pub const NID_sect193r1: c_int = 724;
+pub const NID_sect193r2: c_int = 725;
+pub const NID_sect233k1: c_int = 726;
+pub const NID_sect233r1: c_int = 727;
+pub const NID_sect239k1: c_int = 728;
+pub const NID_sect283k1: c_int = 729;
+pub const NID_sect283r1: c_int = 730;
+pub const NID_sect409k1: c_int = 731;
+pub const NID_sect409r1: c_int = 732;
+pub const NID_sect571k1: c_int = 733;
+pub const NID_sect571r1: c_int = 734;
+pub const NID_wap_wsg_idm_ecid_wtls1: c_int = 735;
+pub const NID_wap_wsg_idm_ecid_wtls3: c_int = 736;
+pub const NID_wap_wsg_idm_ecid_wtls4: c_int = 737;
+pub const NID_wap_wsg_idm_ecid_wtls5: c_int = 738;
+pub const NID_wap_wsg_idm_ecid_wtls6: c_int = 739;
+pub const NID_wap_wsg_idm_ecid_wtls7: c_int = 740;
+pub const NID_wap_wsg_idm_ecid_wtls8: c_int = 741;
+pub const NID_wap_wsg_idm_ecid_wtls9: c_int = 742;
+pub const NID_wap_wsg_idm_ecid_wtls10: c_int = 743;
+pub const NID_wap_wsg_idm_ecid_wtls11: c_int = 744;
+pub const NID_wap_wsg_idm_ecid_wtls12: c_int = 745;
+pub const NID_cast5_cbc: c_int = 108;
+pub const NID_cast5_ecb: c_int = 109;
+pub const NID_cast5_cfb64: c_int = 110;
+pub const NID_cast5_ofb64: c_int = 111;
+pub const NID_pbeWithMD5AndCast5_CBC: c_int = 112;
+pub const NID_id_PasswordBasedMAC: c_int = 782;
+pub const NID_id_DHBasedMac: c_int = 783;
+pub const NID_rsadsi: c_int = 1;
+pub const NID_pkcs: c_int = 2;
+pub const NID_pkcs1: c_int = 186;
+pub const NID_rsaEncryption: c_int = 6;
+pub const NID_md2WithRSAEncryption: c_int = 7;
+pub const NID_md4WithRSAEncryption: c_int = 396;
+pub const NID_md5WithRSAEncryption: c_int = 8;
+pub const NID_sha1WithRSAEncryption: c_int = 65;
+pub const NID_rsaesOaep: c_int = 919;
+pub const NID_mgf1: c_int = 911;
+pub const NID_rsassaPss: c_int = 912;
+pub const NID_sha256WithRSAEncryption: c_int = 668;
+pub const NID_sha384WithRSAEncryption: c_int = 669;
+pub const NID_sha512WithRSAEncryption: c_int = 670;
+pub const NID_sha224WithRSAEncryption: c_int = 671;
+pub const NID_pkcs3: c_int = 27;
+pub const NID_dhKeyAgreement: c_int = 28;
+pub const NID_pkcs5: c_int = 187;
+pub const NID_pbeWithMD2AndDES_CBC: c_int = 9;
+pub const NID_pbeWithMD5AndDES_CBC: c_int = 10;
+pub const NID_pbeWithMD2AndRC2_CBC: c_int = 168;
+pub const NID_pbeWithMD5AndRC2_CBC: c_int = 169;
+pub const NID_pbeWithSHA1AndDES_CBC: c_int = 170;
+pub const NID_pbeWithSHA1AndRC2_CBC: c_int = 68;
+pub const NID_id_pbkdf2: c_int = 69;
+pub const NID_pbes2: c_int = 161;
+pub const NID_pbmac1: c_int = 162;
+pub const NID_pkcs7: c_int = 20;
+pub const NID_pkcs7_data: c_int = 21;
+pub const NID_pkcs7_signed: c_int = 22;
+pub const NID_pkcs7_enveloped: c_int = 23;
+pub const NID_pkcs7_signedAndEnveloped: c_int = 24;
+pub const NID_pkcs7_digest: c_int = 25;
+pub const NID_pkcs7_encrypted: c_int = 26;
+pub const NID_pkcs9: c_int = 47;
+pub const NID_pkcs9_emailAddress: c_int = 48;
+pub const NID_pkcs9_unstructuredName: c_int = 49;
+pub const NID_pkcs9_contentType: c_int = 50;
+pub const NID_pkcs9_messageDigest: c_int = 51;
+pub const NID_pkcs9_signingTime: c_int = 52;
+pub const NID_pkcs9_countersignature: c_int = 53;
+pub const NID_pkcs9_challengePassword: c_int = 54;
+pub const NID_pkcs9_unstructuredAddress: c_int = 55;
+pub const NID_pkcs9_extCertAttributes: c_int = 56;
+pub const NID_ext_req: c_int = 172;
+pub const NID_SMIMECapabilities: c_int = 167;
+pub const NID_SMIME: c_int = 188;
+pub const NID_id_smime_mod: c_int = 189;
+pub const NID_id_smime_ct: c_int = 190;
+pub const NID_id_smime_aa: c_int = 191;
+pub const NID_id_smime_alg: c_int = 192;
+pub const NID_id_smime_cd: c_int = 193;
+pub const NID_id_smime_spq: c_int = 194;
+pub const NID_id_smime_cti: c_int = 195;
+pub const NID_id_smime_mod_cms: c_int = 196;
+pub const NID_id_smime_mod_ess: c_int = 197;
+pub const NID_id_smime_mod_oid: c_int = 198;
+pub const NID_id_smime_mod_msg_v3: c_int = 199;
+pub const NID_id_smime_mod_ets_eSignature_88: c_int = 200;
+pub const NID_id_smime_mod_ets_eSignature_97: c_int = 201;
+pub const NID_id_smime_mod_ets_eSigPolicy_88: c_int = 202;
+pub const NID_id_smime_mod_ets_eSigPolicy_97: c_int = 203;
+pub const NID_id_smime_ct_receipt: c_int = 204;
+pub const NID_id_smime_ct_authData: c_int = 205;
+pub const NID_id_smime_ct_publishCert: c_int = 206;
+pub const NID_id_smime_ct_TSTInfo: c_int = 207;
+pub const NID_id_smime_ct_TDTInfo: c_int = 208;
+pub const NID_id_smime_ct_contentInfo: c_int = 209;
+pub const NID_id_smime_ct_DVCSRequestData: c_int = 210;
+pub const NID_id_smime_ct_DVCSResponseData: c_int = 211;
+pub const NID_id_smime_ct_compressedData: c_int = 786;
+pub const NID_id_ct_asciiTextWithCRLF: c_int = 787;
+pub const NID_id_smime_aa_receiptRequest: c_int = 212;
+pub const NID_id_smime_aa_securityLabel: c_int = 213;
+pub const NID_id_smime_aa_mlExpandHistory: c_int = 214;
+pub const NID_id_smime_aa_contentHint: c_int = 215;
+pub const NID_id_smime_aa_msgSigDigest: c_int = 216;
+pub const NID_id_smime_aa_encapContentType: c_int = 217;
+pub const NID_id_smime_aa_contentIdentifier: c_int = 218;
+pub const NID_id_smime_aa_macValue: c_int = 219;
+pub const NID_id_smime_aa_equivalentLabels: c_int = 220;
+pub const NID_id_smime_aa_contentReference: c_int = 221;
+pub const NID_id_smime_aa_encrypKeyPref: c_int = 222;
+pub const NID_id_smime_aa_signingCertificate: c_int = 223;
+pub const NID_id_smime_aa_smimeEncryptCerts: c_int = 224;
+pub const NID_id_smime_aa_timeStampToken: c_int = 225;
+pub const NID_id_smime_aa_ets_sigPolicyId: c_int = 226;
+pub const NID_id_smime_aa_ets_commitmentType: c_int = 227;
+pub const NID_id_smime_aa_ets_signerLocation: c_int = 228;
+pub const NID_id_smime_aa_ets_signerAttr: c_int = 229;
+pub const NID_id_smime_aa_ets_otherSigCert: c_int = 230;
+pub const NID_id_smime_aa_ets_contentTimestamp: c_int = 231;
+pub const NID_id_smime_aa_ets_CertificateRefs: c_int = 232;
+pub const NID_id_smime_aa_ets_RevocationRefs: c_int = 233;
+pub const NID_id_smime_aa_ets_certValues: c_int = 234;
+pub const NID_id_smime_aa_ets_revocationValues: c_int = 235;
+pub const NID_id_smime_aa_ets_escTimeStamp: c_int = 236;
+pub const NID_id_smime_aa_ets_certCRLTimestamp: c_int = 237;
+pub const NID_id_smime_aa_ets_archiveTimeStamp: c_int = 238;
+pub const NID_id_smime_aa_signatureType: c_int = 239;
+pub const NID_id_smime_aa_dvcs_dvc: c_int = 240;
+pub const NID_id_smime_alg_ESDHwith3DES: c_int = 241;
+pub const NID_id_smime_alg_ESDHwithRC2: c_int = 242;
+pub const NID_id_smime_alg_3DESwrap: c_int = 243;
+pub const NID_id_smime_alg_RC2wrap: c_int = 244;
+pub const NID_id_smime_alg_ESDH: c_int = 245;
+pub const NID_id_smime_alg_CMS3DESwrap: c_int = 246;
+pub const NID_id_smime_alg_CMSRC2wrap: c_int = 247;
+pub const NID_id_alg_PWRI_KEK: c_int = 893;
+pub const NID_id_smime_cd_ldap: c_int = 248;
+pub const NID_id_smime_spq_ets_sqt_uri: c_int = 249;
+pub const NID_id_smime_spq_ets_sqt_unotice: c_int = 250;
+pub const NID_id_smime_cti_ets_proofOfOrigin: c_int = 251;
+pub const NID_id_smime_cti_ets_proofOfReceipt: c_int = 252;
+pub const NID_id_smime_cti_ets_proofOfDelivery: c_int = 253;
+pub const NID_id_smime_cti_ets_proofOfSender: c_int = 254;
+pub const NID_id_smime_cti_ets_proofOfApproval: c_int = 255;
+pub const NID_id_smime_cti_ets_proofOfCreation: c_int = 256;
+pub const NID_friendlyName: c_int = 156;
+pub const NID_localKeyID: c_int = 157;
+pub const NID_ms_csp_name: c_int = 417;
+pub const NID_LocalKeySet: c_int = 856;
+pub const NID_x509Certificate: c_int = 158;
+pub const NID_sdsiCertificate: c_int = 159;
+pub const NID_x509Crl: c_int = 160;
+pub const NID_pbe_WithSHA1And128BitRC4: c_int = 144;
+pub const NID_pbe_WithSHA1And40BitRC4: c_int = 145;
+pub const NID_pbe_WithSHA1And3_Key_TripleDES_CBC: c_int = 146;
+pub const NID_pbe_WithSHA1And2_Key_TripleDES_CBC: c_int = 147;
+pub const NID_pbe_WithSHA1And128BitRC2_CBC: c_int = 148;
+pub const NID_pbe_WithSHA1And40BitRC2_CBC: c_int = 149;
+pub const NID_keyBag: c_int = 150;
+pub const NID_pkcs8ShroudedKeyBag: c_int = 151;
+pub const NID_certBag: c_int = 152;
+pub const NID_crlBag: c_int = 153;
+pub const NID_secretBag: c_int = 154;
+pub const NID_safeContentsBag: c_int = 155;
+pub const NID_md2: c_int = 3;
+pub const NID_md4: c_int = 257;
+pub const NID_md5: c_int = 4;
+pub const NID_md5_sha1: c_int = 114;
+pub const NID_hmacWithMD5: c_int = 797;
+pub const NID_hmacWithSHA1: c_int = 163;
+pub const NID_hmacWithSHA224: c_int = 798;
+pub const NID_hmacWithSHA256: c_int = 799;
+pub const NID_hmacWithSHA384: c_int = 800;
+pub const NID_hmacWithSHA512: c_int = 801;
+pub const NID_rc2_cbc: c_int = 37;
+pub const NID_rc2_ecb: c_int = 38;
+pub const NID_rc2_cfb64: c_int = 39;
+pub const NID_rc2_ofb64: c_int = 40;
+pub const NID_rc2_40_cbc: c_int = 98;
+pub const NID_rc2_64_cbc: c_int = 166;
+pub const NID_rc4: c_int = 5;
+pub const NID_rc4_40: c_int = 97;
+pub const NID_des_ede3_cbc: c_int = 44;
+pub const NID_rc5_cbc: c_int = 120;
+pub const NID_rc5_ecb: c_int = 121;
+pub const NID_rc5_cfb64: c_int = 122;
+pub const NID_rc5_ofb64: c_int = 123;
+pub const NID_ms_ext_req: c_int = 171;
+pub const NID_ms_code_ind: c_int = 134;
+pub const NID_ms_code_com: c_int = 135;
+pub const NID_ms_ctl_sign: c_int = 136;
+pub const NID_ms_sgc: c_int = 137;
+pub const NID_ms_efs: c_int = 138;
+pub const NID_ms_smartcard_login: c_int = 648;
+pub const NID_ms_upn: c_int = 649;
+pub const NID_idea_cbc: c_int = 34;
+pub const NID_idea_ecb: c_int = 36;
+pub const NID_idea_cfb64: c_int = 35;
+pub const NID_idea_ofb64: c_int = 46;
+pub const NID_bf_cbc: c_int = 91;
+pub const NID_bf_ecb: c_int = 92;
+pub const NID_bf_cfb64: c_int = 93;
+pub const NID_bf_ofb64: c_int = 94;
+pub const NID_id_pkix: c_int = 127;
+pub const NID_id_pkix_mod: c_int = 258;
+pub const NID_id_pe: c_int = 175;
+pub const NID_id_qt: c_int = 259;
+pub const NID_id_kp: c_int = 128;
+pub const NID_id_it: c_int = 260;
+pub const NID_id_pkip: c_int = 261;
+pub const NID_id_alg: c_int = 262;
+pub const NID_id_cmc: c_int = 263;
+pub const NID_id_on: c_int = 264;
+pub const NID_id_pda: c_int = 265;
+pub const NID_id_aca: c_int = 266;
+pub const NID_id_qcs: c_int = 267;
+pub const NID_id_cct: c_int = 268;
+pub const NID_id_ppl: c_int = 662;
+pub const NID_id_ad: c_int = 176;
+pub const NID_id_pkix1_explicit_88: c_int = 269;
+pub const NID_id_pkix1_implicit_88: c_int = 270;
+pub const NID_id_pkix1_explicit_93: c_int = 271;
+pub const NID_id_pkix1_implicit_93: c_int = 272;
+pub const NID_id_mod_crmf: c_int = 273;
+pub const NID_id_mod_cmc: c_int = 274;
+pub const NID_id_mod_kea_profile_88: c_int = 275;
+pub const NID_id_mod_kea_profile_93: c_int = 276;
+pub const NID_id_mod_cmp: c_int = 277;
+pub const NID_id_mod_qualified_cert_88: c_int = 278;
+pub const NID_id_mod_qualified_cert_93: c_int = 279;
+pub const NID_id_mod_attribute_cert: c_int = 280;
+pub const NID_id_mod_timestamp_protocol: c_int = 281;
+pub const NID_id_mod_ocsp: c_int = 282;
+pub const NID_id_mod_dvcs: c_int = 283;
+pub const NID_id_mod_cmp2000: c_int = 284;
+pub const NID_info_access: c_int = 177;
+pub const NID_biometricInfo: c_int = 285;
+pub const NID_qcStatements: c_int = 286;
+pub const NID_ac_auditEntity: c_int = 287;
+pub const NID_ac_targeting: c_int = 288;
+pub const NID_aaControls: c_int = 289;
+pub const NID_sbgp_ipAddrBlock: c_int = 290;
+pub const NID_sbgp_autonomousSysNum: c_int = 291;
+pub const NID_sbgp_routerIdentifier: c_int = 292;
+pub const NID_ac_proxying: c_int = 397;
+pub const NID_sinfo_access: c_int = 398;
+pub const NID_proxyCertInfo: c_int = 663;
+pub const NID_id_qt_cps: c_int = 164;
+pub const NID_id_qt_unotice: c_int = 165;
+pub const NID_textNotice: c_int = 293;
+pub const NID_server_auth: c_int = 129;
+pub const NID_client_auth: c_int = 130;
+pub const NID_code_sign: c_int = 131;
+pub const NID_email_protect: c_int = 132;
+pub const NID_ipsecEndSystem: c_int = 294;
+pub const NID_ipsecTunnel: c_int = 295;
+pub const NID_ipsecUser: c_int = 296;
+pub const NID_time_stamp: c_int = 133;
+pub const NID_OCSP_sign: c_int = 180;
+pub const NID_dvcs: c_int = 297;
+pub const NID_id_it_caProtEncCert: c_int = 298;
+pub const NID_id_it_signKeyPairTypes: c_int = 299;
+pub const NID_id_it_encKeyPairTypes: c_int = 300;
+pub const NID_id_it_preferredSymmAlg: c_int = 301;
+pub const NID_id_it_caKeyUpdateInfo: c_int = 302;
+pub const NID_id_it_currentCRL: c_int = 303;
+pub const NID_id_it_unsupportedOIDs: c_int = 304;
+pub const NID_id_it_subscriptionRequest: c_int = 305;
+pub const NID_id_it_subscriptionResponse: c_int = 306;
+pub const NID_id_it_keyPairParamReq: c_int = 307;
+pub const NID_id_it_keyPairParamRep: c_int = 308;
+pub const NID_id_it_revPassphrase: c_int = 309;
+pub const NID_id_it_implicitConfirm: c_int = 310;
+pub const NID_id_it_confirmWaitTime: c_int = 311;
+pub const NID_id_it_origPKIMessage: c_int = 312;
+pub const NID_id_it_suppLangTags: c_int = 784;
+pub const NID_id_regCtrl: c_int = 313;
+pub const NID_id_regInfo: c_int = 314;
+pub const NID_id_regCtrl_regToken: c_int = 315;
+pub const NID_id_regCtrl_authenticator: c_int = 316;
+pub const NID_id_regCtrl_pkiPublicationInfo: c_int = 317;
+pub const NID_id_regCtrl_pkiArchiveOptions: c_int = 318;
+pub const NID_id_regCtrl_oldCertID: c_int = 319;
+pub const NID_id_regCtrl_protocolEncrKey: c_int = 320;
+pub const NID_id_regInfo_utf8Pairs: c_int = 321;
+pub const NID_id_regInfo_certReq: c_int = 322;
+pub const NID_id_alg_des40: c_int = 323;
+pub const NID_id_alg_noSignature: c_int = 324;
+pub const NID_id_alg_dh_sig_hmac_sha1: c_int = 325;
+pub const NID_id_alg_dh_pop: c_int = 326;
+pub const NID_id_cmc_statusInfo: c_int = 327;
+pub const NID_id_cmc_identification: c_int = 328;
+pub const NID_id_cmc_identityProof: c_int = 329;
+pub const NID_id_cmc_dataReturn: c_int = 330;
+pub const NID_id_cmc_transactionId: c_int = 331;
+pub const NID_id_cmc_senderNonce: c_int = 332;
+pub const NID_id_cmc_recipientNonce: c_int = 333;
+pub const NID_id_cmc_addExtensions: c_int = 334;
+pub const NID_id_cmc_encryptedPOP: c_int = 335;
+pub const NID_id_cmc_decryptedPOP: c_int = 336;
+pub const NID_id_cmc_lraPOPWitness: c_int = 337;
+pub const NID_id_cmc_getCert: c_int = 338;
+pub const NID_id_cmc_getCRL: c_int = 339;
+pub const NID_id_cmc_revokeRequest: c_int = 340;
+pub const NID_id_cmc_regInfo: c_int = 341;
+pub const NID_id_cmc_responseInfo: c_int = 342;
+pub const NID_id_cmc_queryPending: c_int = 343;
+pub const NID_id_cmc_popLinkRandom: c_int = 344;
+pub const NID_id_cmc_popLinkWitness: c_int = 345;
+pub const NID_id_cmc_confirmCertAcceptance: c_int = 346;
+pub const NID_id_on_personalData: c_int = 347;
+pub const NID_id_on_permanentIdentifier: c_int = 858;
+pub const NID_id_pda_dateOfBirth: c_int = 348;
+pub const NID_id_pda_placeOfBirth: c_int = 349;
+pub const NID_id_pda_gender: c_int = 351;
+pub const NID_id_pda_countryOfCitizenship: c_int = 352;
+pub const NID_id_pda_countryOfResidence: c_int = 353;
+pub const NID_id_aca_authenticationInfo: c_int = 354;
+pub const NID_id_aca_accessIdentity: c_int = 355;
+pub const NID_id_aca_chargingIdentity: c_int = 356;
+pub const NID_id_aca_group: c_int = 357;
+pub const NID_id_aca_role: c_int = 358;
+pub const NID_id_aca_encAttrs: c_int = 399;
+pub const NID_id_qcs_pkixQCSyntax_v1: c_int = 359;
+pub const NID_id_cct_crs: c_int = 360;
+pub const NID_id_cct_PKIData: c_int = 361;
+pub const NID_id_cct_PKIResponse: c_int = 362;
+pub const NID_id_ppl_anyLanguage: c_int = 664;
+pub const NID_id_ppl_inheritAll: c_int = 665;
+pub const NID_Independent: c_int = 667;
+pub const NID_ad_OCSP: c_int = 178;
+pub const NID_ad_ca_issuers: c_int = 179;
+pub const NID_ad_timeStamping: c_int = 363;
+pub const NID_ad_dvcs: c_int = 364;
+pub const NID_caRepository: c_int = 785;
+pub const NID_id_pkix_OCSP_basic: c_int = 365;
+pub const NID_id_pkix_OCSP_Nonce: c_int = 366;
+pub const NID_id_pkix_OCSP_CrlID: c_int = 367;
+pub const NID_id_pkix_OCSP_acceptableResponses: c_int = 368;
+pub const NID_id_pkix_OCSP_noCheck: c_int = 369;
+pub const NID_id_pkix_OCSP_archiveCutoff: c_int = 370;
+pub const NID_id_pkix_OCSP_serviceLocator: c_int = 371;
+pub const NID_id_pkix_OCSP_extendedStatus: c_int = 372;
+pub const NID_id_pkix_OCSP_valid: c_int = 373;
+pub const NID_id_pkix_OCSP_path: c_int = 374;
+pub const NID_id_pkix_OCSP_trustRoot: c_int = 375;
+pub const NID_algorithm: c_int = 376;
+pub const NID_md5WithRSA: c_int = 104;
+pub const NID_des_ecb: c_int = 29;
+pub const NID_des_cbc: c_int = 31;
+pub const NID_des_ofb64: c_int = 45;
+pub const NID_des_cfb64: c_int = 30;
+pub const NID_rsaSignature: c_int = 377;
+pub const NID_dsa_2: c_int = 67;
+pub const NID_dsaWithSHA: c_int = 66;
+pub const NID_shaWithRSAEncryption: c_int = 42;
+pub const NID_des_ede_ecb: c_int = 32;
+pub const NID_des_ede3_ecb: c_int = 33;
+pub const NID_des_ede_cbc: c_int = 43;
+pub const NID_des_ede_cfb64: c_int = 60;
+pub const NID_des_ede3_cfb64: c_int = 61;
+pub const NID_des_ede_ofb64: c_int = 62;
+pub const NID_des_ede3_ofb64: c_int = 63;
+pub const NID_desx_cbc: c_int = 80;
+pub const NID_sha: c_int = 41;
+pub const NID_sha1: c_int = 64;
+pub const NID_dsaWithSHA1_2: c_int = 70;
+pub const NID_sha1WithRSA: c_int = 115;
+pub const NID_ripemd160: c_int = 117;
+pub const NID_ripemd160WithRSA: c_int = 119;
+pub const NID_sxnet: c_int = 143;
+pub const NID_X500: c_int = 11;
+pub const NID_X509: c_int = 12;
+pub const NID_commonName: c_int = 13;
+pub const NID_surname: c_int = 100;
+pub const NID_serialNumber: c_int = 105;
+pub const NID_countryName: c_int = 14;
+pub const NID_localityName: c_int = 15;
+pub const NID_stateOrProvinceName: c_int = 16;
+pub const NID_streetAddress: c_int = 660;
+pub const NID_organizationName: c_int = 17;
+pub const NID_organizationalUnitName: c_int = 18;
+pub const NID_title: c_int = 106;
+pub const NID_description: c_int = 107;
+pub const NID_searchGuide: c_int = 859;
+pub const NID_businessCategory: c_int = 860;
+pub const NID_postalAddress: c_int = 861;
+pub const NID_postalCode: c_int = 661;
+pub const NID_postOfficeBox: c_int = 862;
+pub const NID_physicalDeliveryOfficeName: c_int = 863;
+pub const NID_telephoneNumber: c_int = 864;
+pub const NID_telexNumber: c_int = 865;
+pub const NID_teletexTerminalIdentifier: c_int = 866;
+pub const NID_facsimileTelephoneNumber: c_int = 867;
+pub const NID_x121Address: c_int = 868;
+pub const NID_internationaliSDNNumber: c_int = 869;
+pub const NID_registeredAddress: c_int = 870;
+pub const NID_destinationIndicator: c_int = 871;
+pub const NID_preferredDeliveryMethod: c_int = 872;
+pub const NID_presentationAddress: c_int = 873;
+pub const NID_supportedApplicationContext: c_int = 874;
+pub const NID_member: c_int = 875;
+pub const NID_owner: c_int = 876;
+pub const NID_roleOccupant: c_int = 877;
+pub const NID_seeAlso: c_int = 878;
+pub const NID_userPassword: c_int = 879;
+pub const NID_userCertificate: c_int = 880;
+pub const NID_cACertificate: c_int = 881;
+pub const NID_authorityRevocationList: c_int = 882;
+pub const NID_certificateRevocationList: c_int = 883;
+pub const NID_crossCertificatePair: c_int = 884;
+pub const NID_name: c_int = 173;
+pub const NID_givenName: c_int = 99;
+pub const NID_initials: c_int = 101;
+pub const NID_generationQualifier: c_int = 509;
+pub const NID_x500UniqueIdentifier: c_int = 503;
+pub const NID_dnQualifier: c_int = 174;
+pub const NID_enhancedSearchGuide: c_int = 885;
+pub const NID_protocolInformation: c_int = 886;
+pub const NID_distinguishedName: c_int = 887;
+pub const NID_uniqueMember: c_int = 888;
+pub const NID_houseIdentifier: c_int = 889;
+pub const NID_supportedAlgorithms: c_int = 890;
+pub const NID_deltaRevocationList: c_int = 891;
+pub const NID_dmdName: c_int = 892;
+pub const NID_pseudonym: c_int = 510;
+pub const NID_role: c_int = 400;
+pub const NID_X500algorithms: c_int = 378;
+pub const NID_rsa: c_int = 19;
+pub const NID_mdc2WithRSA: c_int = 96;
+pub const NID_mdc2: c_int = 95;
+pub const NID_id_ce: c_int = 81;
+pub const NID_subject_directory_attributes: c_int = 769;
+pub const NID_subject_key_identifier: c_int = 82;
+pub const NID_key_usage: c_int = 83;
+pub const NID_private_key_usage_period: c_int = 84;
+pub const NID_subject_alt_name: c_int = 85;
+pub const NID_issuer_alt_name: c_int = 86;
+pub const NID_basic_constraints: c_int = 87;
+pub const NID_crl_number: c_int = 88;
+pub const NID_crl_reason: c_int = 141;
+pub const NID_invalidity_date: c_int = 142;
+pub const NID_delta_crl: c_int = 140;
+pub const NID_issuing_distribution_point: c_int = 770;
+pub const NID_certificate_issuer: c_int = 771;
+pub const NID_name_constraints: c_int = 666;
+pub const NID_crl_distribution_points: c_int = 103;
+pub const NID_certificate_policies: c_int = 89;
+pub const NID_any_policy: c_int = 746;
+pub const NID_policy_mappings: c_int = 747;
+pub const NID_authority_key_identifier: c_int = 90;
+pub const NID_policy_constraints: c_int = 401;
+pub const NID_ext_key_usage: c_int = 126;
+pub const NID_freshest_crl: c_int = 857;
+pub const NID_inhibit_any_policy: c_int = 748;
+pub const NID_target_information: c_int = 402;
+pub const NID_no_rev_avail: c_int = 403;
+pub const NID_anyExtendedKeyUsage: c_int = 910;
+pub const NID_netscape: c_int = 57;
+pub const NID_netscape_cert_extension: c_int = 58;
+pub const NID_netscape_data_type: c_int = 59;
+pub const NID_netscape_cert_type: c_int = 71;
+pub const NID_netscape_base_url: c_int = 72;
+pub const NID_netscape_revocation_url: c_int = 73;
+pub const NID_netscape_ca_revocation_url: c_int = 74;
+pub const NID_netscape_renewal_url: c_int = 75;
+pub const NID_netscape_ca_policy_url: c_int = 76;
+pub const NID_netscape_ssl_server_name: c_int = 77;
+pub const NID_netscape_comment: c_int = 78;
+pub const NID_netscape_cert_sequence: c_int = 79;
+pub const NID_ns_sgc: c_int = 139;
+pub const NID_org: c_int = 379;
+pub const NID_dod: c_int = 380;
+pub const NID_iana: c_int = 381;
+pub const NID_Directory: c_int = 382;
+pub const NID_Management: c_int = 383;
+pub const NID_Experimental: c_int = 384;
+pub const NID_Private: c_int = 385;
+pub const NID_Security: c_int = 386;
+pub const NID_SNMPv2: c_int = 387;
+pub const NID_Mail: c_int = 388;
+pub const NID_Enterprises: c_int = 389;
+pub const NID_dcObject: c_int = 390;
+pub const NID_mime_mhs: c_int = 504;
+pub const NID_mime_mhs_headings: c_int = 505;
+pub const NID_mime_mhs_bodies: c_int = 506;
+pub const NID_id_hex_partial_message: c_int = 507;
+pub const NID_id_hex_multipart_message: c_int = 508;
+pub const NID_zlib_compression: c_int = 125;
+pub const NID_aes_128_ecb: c_int = 418;
+pub const NID_aes_128_cbc: c_int = 419;
+pub const NID_aes_128_ofb128: c_int = 420;
+pub const NID_aes_128_cfb128: c_int = 421;
+pub const NID_id_aes128_wrap: c_int = 788;
+pub const NID_aes_128_gcm: c_int = 895;
+pub const NID_aes_128_ccm: c_int = 896;
+pub const NID_id_aes128_wrap_pad: c_int = 897;
+pub const NID_aes_192_ecb: c_int = 422;
+pub const NID_aes_192_cbc: c_int = 423;
+pub const NID_aes_192_ofb128: c_int = 424;
+pub const NID_aes_192_cfb128: c_int = 425;
+pub const NID_id_aes192_wrap: c_int = 789;
+pub const NID_aes_192_gcm: c_int = 898;
+pub const NID_aes_192_ccm: c_int = 899;
+pub const NID_id_aes192_wrap_pad: c_int = 900;
+pub const NID_aes_256_ecb: c_int = 426;
+pub const NID_aes_256_cbc: c_int = 427;
+pub const NID_aes_256_ofb128: c_int = 428;
+pub const NID_aes_256_cfb128: c_int = 429;
+pub const NID_id_aes256_wrap: c_int = 790;
+pub const NID_aes_256_gcm: c_int = 901;
+pub const NID_aes_256_ccm: c_int = 902;
+pub const NID_id_aes256_wrap_pad: c_int = 903;
+pub const NID_aes_128_cfb1: c_int = 650;
+pub const NID_aes_192_cfb1: c_int = 651;
+pub const NID_aes_256_cfb1: c_int = 652;
+pub const NID_aes_128_cfb8: c_int = 653;
+pub const NID_aes_192_cfb8: c_int = 654;
+pub const NID_aes_256_cfb8: c_int = 655;
+pub const NID_aes_128_ctr: c_int = 904;
+pub const NID_aes_192_ctr: c_int = 905;
+pub const NID_aes_256_ctr: c_int = 906;
+pub const NID_aes_128_xts: c_int = 913;
+pub const NID_aes_256_xts: c_int = 914;
+pub const NID_des_cfb1: c_int = 656;
+pub const NID_des_cfb8: c_int = 657;
+pub const NID_des_ede3_cfb1: c_int = 658;
+pub const NID_des_ede3_cfb8: c_int = 659;
+pub const NID_sha256: c_int = 672;
+pub const NID_sha384: c_int = 673;
+pub const NID_sha512: c_int = 674;
+pub const NID_sha224: c_int = 675;
+pub const NID_dsa_with_SHA224: c_int = 802;
+pub const NID_dsa_with_SHA256: c_int = 803;
+pub const NID_hold_instruction_code: c_int = 430;
+pub const NID_hold_instruction_none: c_int = 431;
+pub const NID_hold_instruction_call_issuer: c_int = 432;
+pub const NID_hold_instruction_reject: c_int = 433;
+pub const NID_data: c_int = 434;
+pub const NID_pss: c_int = 435;
+pub const NID_ucl: c_int = 436;
+pub const NID_pilot: c_int = 437;
+pub const NID_pilotAttributeType: c_int = 438;
+pub const NID_pilotAttributeSyntax: c_int = 439;
+pub const NID_pilotObjectClass: c_int = 440;
+pub const NID_pilotGroups: c_int = 441;
+pub const NID_iA5StringSyntax: c_int = 442;
+pub const NID_caseIgnoreIA5StringSyntax: c_int = 443;
+pub const NID_pilotObject: c_int = 444;
+pub const NID_pilotPerson: c_int = 445;
+pub const NID_account: c_int = 446;
+pub const NID_document: c_int = 447;
+pub const NID_room: c_int = 448;
+pub const NID_documentSeries: c_int = 449;
+pub const NID_Domain: c_int = 392;
+pub const NID_rFC822localPart: c_int = 450;
+pub const NID_dNSDomain: c_int = 451;
+pub const NID_domainRelatedObject: c_int = 452;
+pub const NID_friendlyCountry: c_int = 453;
+pub const NID_simpleSecurityObject: c_int = 454;
+pub const NID_pilotOrganization: c_int = 455;
+pub const NID_pilotDSA: c_int = 456;
+pub const NID_qualityLabelledData: c_int = 457;
+pub const NID_userId: c_int = 458;
+pub const NID_textEncodedORAddress: c_int = 459;
+pub const NID_rfc822Mailbox: c_int = 460;
+pub const NID_info: c_int = 461;
+pub const NID_favouriteDrink: c_int = 462;
+pub const NID_roomNumber: c_int = 463;
+pub const NID_photo: c_int = 464;
+pub const NID_userClass: c_int = 465;
+pub const NID_host: c_int = 466;
+pub const NID_manager: c_int = 467;
+pub const NID_documentIdentifier: c_int = 468;
+pub const NID_documentTitle: c_int = 469;
+pub const NID_documentVersion: c_int = 470;
+pub const NID_documentAuthor: c_int = 471;
+pub const NID_documentLocation: c_int = 472;
+pub const NID_homeTelephoneNumber: c_int = 473;
+pub const NID_secretary: c_int = 474;
+pub const NID_otherMailbox: c_int = 475;
+pub const NID_lastModifiedTime: c_int = 476;
+pub const NID_lastModifiedBy: c_int = 477;
+pub const NID_domainComponent: c_int = 391;
+pub const NID_aRecord: c_int = 478;
+pub const NID_pilotAttributeType27: c_int = 479;
+pub const NID_mXRecord: c_int = 480;
+pub const NID_nSRecord: c_int = 481;
+pub const NID_sOARecord: c_int = 482;
+pub const NID_cNAMERecord: c_int = 483;
+pub const NID_associatedDomain: c_int = 484;
+pub const NID_associatedName: c_int = 485;
+pub const NID_homePostalAddress: c_int = 486;
+pub const NID_personalTitle: c_int = 487;
+pub const NID_mobileTelephoneNumber: c_int = 488;
+pub const NID_pagerTelephoneNumber: c_int = 489;
+pub const NID_friendlyCountryName: c_int = 490;
+pub const NID_organizationalStatus: c_int = 491;
+pub const NID_janetMailbox: c_int = 492;
+pub const NID_mailPreferenceOption: c_int = 493;
+pub const NID_buildingName: c_int = 494;
+pub const NID_dSAQuality: c_int = 495;
+pub const NID_singleLevelQuality: c_int = 496;
+pub const NID_subtreeMinimumQuality: c_int = 497;
+pub const NID_subtreeMaximumQuality: c_int = 498;
+pub const NID_personalSignature: c_int = 499;
+pub const NID_dITRedirect: c_int = 500;
+pub const NID_audio: c_int = 501;
+pub const NID_documentPublisher: c_int = 502;
+pub const NID_id_set: c_int = 512;
+pub const NID_set_ctype: c_int = 513;
+pub const NID_set_msgExt: c_int = 514;
+pub const NID_set_attr: c_int = 515;
+pub const NID_set_policy: c_int = 516;
+pub const NID_set_certExt: c_int = 517;
+pub const NID_set_brand: c_int = 518;
+pub const NID_setct_PANData: c_int = 519;
+pub const NID_setct_PANToken: c_int = 520;
+pub const NID_setct_PANOnly: c_int = 521;
+pub const NID_setct_OIData: c_int = 522;
+pub const NID_setct_PI: c_int = 523;
+pub const NID_setct_PIData: c_int = 524;
+pub const NID_setct_PIDataUnsigned: c_int = 525;
+pub const NID_setct_HODInput: c_int = 526;
+pub const NID_setct_AuthResBaggage: c_int = 527;
+pub const NID_setct_AuthRevReqBaggage: c_int = 528;
+pub const NID_setct_AuthRevResBaggage: c_int = 529;
+pub const NID_setct_CapTokenSeq: c_int = 530;
+pub const NID_setct_PInitResData: c_int = 531;
+pub const NID_setct_PI_TBS: c_int = 532;
+pub const NID_setct_PResData: c_int = 533;
+pub const NID_setct_AuthReqTBS: c_int = 534;
+pub const NID_setct_AuthResTBS: c_int = 535;
+pub const NID_setct_AuthResTBSX: c_int = 536;
+pub const NID_setct_AuthTokenTBS: c_int = 537;
+pub const NID_setct_CapTokenData: c_int = 538;
+pub const NID_setct_CapTokenTBS: c_int = 539;
+pub const NID_setct_AcqCardCodeMsg: c_int = 540;
+pub const NID_setct_AuthRevReqTBS: c_int = 541;
+pub const NID_setct_AuthRevResData: c_int = 542;
+pub const NID_setct_AuthRevResTBS: c_int = 543;
+pub const NID_setct_CapReqTBS: c_int = 544;
+pub const NID_setct_CapReqTBSX: c_int = 545;
+pub const NID_setct_CapResData: c_int = 546;
+pub const NID_setct_CapRevReqTBS: c_int = 547;
+pub const NID_setct_CapRevReqTBSX: c_int = 548;
+pub const NID_setct_CapRevResData: c_int = 549;
+pub const NID_setct_CredReqTBS: c_int = 550;
+pub const NID_setct_CredReqTBSX: c_int = 551;
+pub const NID_setct_CredResData: c_int = 552;
+pub const NID_setct_CredRevReqTBS: c_int = 553;
+pub const NID_setct_CredRevReqTBSX: c_int = 554;
+pub const NID_setct_CredRevResData: c_int = 555;
+pub const NID_setct_PCertReqData: c_int = 556;
+pub const NID_setct_PCertResTBS: c_int = 557;
+pub const NID_setct_BatchAdminReqData: c_int = 558;
+pub const NID_setct_BatchAdminResData: c_int = 559;
+pub const NID_setct_CardCInitResTBS: c_int = 560;
+pub const NID_setct_MeAqCInitResTBS: c_int = 561;
+pub const NID_setct_RegFormResTBS: c_int = 562;
+pub const NID_setct_CertReqData: c_int = 563;
+pub const NID_setct_CertReqTBS: c_int = 564;
+pub const NID_setct_CertResData: c_int = 565;
+pub const NID_setct_CertInqReqTBS: c_int = 566;
+pub const NID_setct_ErrorTBS: c_int = 567;
+pub const NID_setct_PIDualSignedTBE: c_int = 568;
+pub const NID_setct_PIUnsignedTBE: c_int = 569;
+pub const NID_setct_AuthReqTBE: c_int = 570;
+pub const NID_setct_AuthResTBE: c_int = 571;
+pub const NID_setct_AuthResTBEX: c_int = 572;
+pub const NID_setct_AuthTokenTBE: c_int = 573;
+pub const NID_setct_CapTokenTBE: c_int = 574;
+pub const NID_setct_CapTokenTBEX: c_int = 575;
+pub const NID_setct_AcqCardCodeMsgTBE: c_int = 576;
+pub const NID_setct_AuthRevReqTBE: c_int = 577;
+pub const NID_setct_AuthRevResTBE: c_int = 578;
+pub const NID_setct_AuthRevResTBEB: c_int = 579;
+pub const NID_setct_CapReqTBE: c_int = 580;
+pub const NID_setct_CapReqTBEX: c_int = 581;
+pub const NID_setct_CapResTBE: c_int = 582;
+pub const NID_setct_CapRevReqTBE: c_int = 583;
+pub const NID_setct_CapRevReqTBEX: c_int = 584;
+pub const NID_setct_CapRevResTBE: c_int = 585;
+pub const NID_setct_CredReqTBE: c_int = 586;
+pub const NID_setct_CredReqTBEX: c_int = 587;
+pub const NID_setct_CredResTBE: c_int = 588;
+pub const NID_setct_CredRevReqTBE: c_int = 589;
+pub const NID_setct_CredRevReqTBEX: c_int = 590;
+pub const NID_setct_CredRevResTBE: c_int = 591;
+pub const NID_setct_BatchAdminReqTBE: c_int = 592;
+pub const NID_setct_BatchAdminResTBE: c_int = 593;
+pub const NID_setct_RegFormReqTBE: c_int = 594;
+pub const NID_setct_CertReqTBE: c_int = 595;
+pub const NID_setct_CertReqTBEX: c_int = 596;
+pub const NID_setct_CertResTBE: c_int = 597;
+pub const NID_setct_CRLNotificationTBS: c_int = 598;
+pub const NID_setct_CRLNotificationResTBS: c_int = 599;
+pub const NID_setct_BCIDistributionTBS: c_int = 600;
+pub const NID_setext_genCrypt: c_int = 601;
+pub const NID_setext_miAuth: c_int = 602;
+pub const NID_setext_pinSecure: c_int = 603;
+pub const NID_setext_pinAny: c_int = 604;
+pub const NID_setext_track2: c_int = 605;
+pub const NID_setext_cv: c_int = 606;
+pub const NID_set_policy_root: c_int = 607;
+pub const NID_setCext_hashedRoot: c_int = 608;
+pub const NID_setCext_certType: c_int = 609;
+pub const NID_setCext_merchData: c_int = 610;
+pub const NID_setCext_cCertRequired: c_int = 611;
+pub const NID_setCext_tunneling: c_int = 612;
+pub const NID_setCext_setExt: c_int = 613;
+pub const NID_setCext_setQualf: c_int = 614;
+pub const NID_setCext_PGWYcapabilities: c_int = 615;
+pub const NID_setCext_TokenIdentifier: c_int = 616;
+pub const NID_setCext_Track2Data: c_int = 617;
+pub const NID_setCext_TokenType: c_int = 618;
+pub const NID_setCext_IssuerCapabilities: c_int = 619;
+pub const NID_setAttr_Cert: c_int = 620;
+pub const NID_setAttr_PGWYcap: c_int = 621;
+pub const NID_setAttr_TokenType: c_int = 622;
+pub const NID_setAttr_IssCap: c_int = 623;
+pub const NID_set_rootKeyThumb: c_int = 624;
+pub const NID_set_addPolicy: c_int = 625;
+pub const NID_setAttr_Token_EMV: c_int = 626;
+pub const NID_setAttr_Token_B0Prime: c_int = 627;
+pub const NID_setAttr_IssCap_CVM: c_int = 628;
+pub const NID_setAttr_IssCap_T2: c_int = 629;
+pub const NID_setAttr_IssCap_Sig: c_int = 630;
+pub const NID_setAttr_GenCryptgrm: c_int = 631;
+pub const NID_setAttr_T2Enc: c_int = 632;
+pub const NID_setAttr_T2cleartxt: c_int = 633;
+pub const NID_setAttr_TokICCsig: c_int = 634;
+pub const NID_setAttr_SecDevSig: c_int = 635;
+pub const NID_set_brand_IATA_ATA: c_int = 636;
+pub const NID_set_brand_Diners: c_int = 637;
+pub const NID_set_brand_AmericanExpress: c_int = 638;
+pub const NID_set_brand_JCB: c_int = 639;
+pub const NID_set_brand_Visa: c_int = 640;
+pub const NID_set_brand_MasterCard: c_int = 641;
+pub const NID_set_brand_Novus: c_int = 642;
+pub const NID_des_cdmf: c_int = 643;
+pub const NID_rsaOAEPEncryptionSET: c_int = 644;
+pub const NID_ipsec3: c_int = 749;
+pub const NID_ipsec4: c_int = 750;
+pub const NID_whirlpool: c_int = 804;
+pub const NID_cryptopro: c_int = 805;
+pub const NID_cryptocom: c_int = 806;
+pub const NID_id_GostR3411_94_with_GostR3410_2001: c_int = 807;
+pub const NID_id_GostR3411_94_with_GostR3410_94: c_int = 808;
+pub const NID_id_GostR3411_94: c_int = 809;
+pub const NID_id_HMACGostR3411_94: c_int = 810;
+pub const NID_id_GostR3410_2001: c_int = 811;
+pub const NID_id_GostR3410_94: c_int = 812;
+pub const NID_id_Gost28147_89: c_int = 813;
+pub const NID_gost89_cnt: c_int = 814;
+pub const NID_id_Gost28147_89_MAC: c_int = 815;
+pub const NID_id_GostR3411_94_prf: c_int = 816;
+pub const NID_id_GostR3410_2001DH: c_int = 817;
+pub const NID_id_GostR3410_94DH: c_int = 818;
+pub const NID_id_Gost28147_89_CryptoPro_KeyMeshing: c_int = 819;
+pub const NID_id_Gost28147_89_None_KeyMeshing: c_int = 820;
+pub const NID_id_GostR3411_94_TestParamSet: c_int = 821;
+pub const NID_id_GostR3411_94_CryptoProParamSet: c_int = 822;
+pub const NID_id_Gost28147_89_TestParamSet: c_int = 823;
+pub const NID_id_Gost28147_89_CryptoPro_A_ParamSet: c_int = 824;
+pub const NID_id_Gost28147_89_CryptoPro_B_ParamSet: c_int = 825;
+pub const NID_id_Gost28147_89_CryptoPro_C_ParamSet: c_int = 826;
+pub const NID_id_Gost28147_89_CryptoPro_D_ParamSet: c_int = 827;
+pub const NID_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet: c_int = 828;
+pub const NID_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet: c_int = 829;
+pub const NID_id_Gost28147_89_CryptoPro_RIC_1_ParamSet: c_int = 830;
+pub const NID_id_GostR3410_94_TestParamSet: c_int = 831;
+pub const NID_id_GostR3410_94_CryptoPro_A_ParamSet: c_int = 832;
+pub const NID_id_GostR3410_94_CryptoPro_B_ParamSet: c_int = 833;
+pub const NID_id_GostR3410_94_CryptoPro_C_ParamSet: c_int = 834;
+pub const NID_id_GostR3410_94_CryptoPro_D_ParamSet: c_int = 835;
+pub const NID_id_GostR3410_94_CryptoPro_XchA_ParamSet: c_int = 836;
+pub const NID_id_GostR3410_94_CryptoPro_XchB_ParamSet: c_int = 837;
+pub const NID_id_GostR3410_94_CryptoPro_XchC_ParamSet: c_int = 838;
+pub const NID_id_GostR3410_2001_TestParamSet: c_int = 839;
+pub const NID_id_GostR3410_2001_CryptoPro_A_ParamSet: c_int = 840;
+pub const NID_id_GostR3410_2001_CryptoPro_B_ParamSet: c_int = 841;
+pub const NID_id_GostR3410_2001_CryptoPro_C_ParamSet: c_int = 842;
+pub const NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet: c_int = 843;
+pub const NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet: c_int = 844;
+pub const NID_id_GostR3410_94_a: c_int = 845;
+pub const NID_id_GostR3410_94_aBis: c_int = 846;
+pub const NID_id_GostR3410_94_b: c_int = 847;
+pub const NID_id_GostR3410_94_bBis: c_int = 848;
+pub const NID_id_Gost28147_89_cc: c_int = 849;
+pub const NID_id_GostR3410_94_cc: c_int = 850;
+pub const NID_id_GostR3410_2001_cc: c_int = 851;
+pub const NID_id_GostR3411_94_with_GostR3410_94_cc: c_int = 852;
+pub const NID_id_GostR3411_94_with_GostR3410_2001_cc: c_int = 853;
+pub const NID_id_GostR3410_2001_ParamSet_cc: c_int = 854;
+pub const NID_camellia_128_cbc: c_int = 751;
+pub const NID_camellia_192_cbc: c_int = 752;
+pub const NID_camellia_256_cbc: c_int = 753;
+pub const NID_id_camellia128_wrap: c_int = 907;
+pub const NID_id_camellia192_wrap: c_int = 908;
+pub const NID_id_camellia256_wrap: c_int = 909;
+pub const NID_camellia_128_ecb: c_int = 754;
+pub const NID_camellia_128_ofb128: c_int = 766;
+pub const NID_camellia_128_cfb128: c_int = 757;
+pub const NID_camellia_192_ecb: c_int = 755;
+pub const NID_camellia_192_ofb128: c_int = 767;
+pub const NID_camellia_192_cfb128: c_int = 758;
+pub const NID_camellia_256_ecb: c_int = 756;
+pub const NID_camellia_256_ofb128: c_int = 768;
+pub const NID_camellia_256_cfb128: c_int = 759;
+pub const NID_camellia_128_cfb1: c_int = 760;
+pub const NID_camellia_192_cfb1: c_int = 761;
+pub const NID_camellia_256_cfb1: c_int = 762;
+pub const NID_camellia_128_cfb8: c_int = 763;
+pub const NID_camellia_192_cfb8: c_int = 764;
+pub const NID_camellia_256_cfb8: c_int = 765;
+pub const NID_kisa: c_int = 773;
+pub const NID_seed_ecb: c_int = 776;
+pub const NID_seed_cbc: c_int = 777;
+pub const NID_seed_cfb128: c_int = 779;
+pub const NID_seed_ofb128: c_int = 778;
+pub const NID_hmac: c_int = 855;
+pub const NID_cmac: c_int = 894;
+pub const NID_rc4_hmac_md5: c_int = 915;
+pub const NID_aes_128_cbc_hmac_sha1: c_int = 916;
+pub const NID_aes_192_cbc_hmac_sha1: c_int = 917;
+pub const NID_aes_256_cbc_hmac_sha1: c_int = 918;

21
lang/rust/files/patch-src_vendor_openssl-sys_src_object.rs Normal file
View file

@ -0,0 +1,21 @@
--- src/vendor/openssl-sys/src/object.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/object.rs
@@ -0,0 +1,18 @@
+use libc::*;
+
+use *;
+
+extern "C" {
+ pub fn OBJ_nid2ln(nid: c_int) -> *const c_char;
+ pub fn OBJ_nid2sn(nid: c_int) -> *const c_char;
+ pub fn OBJ_obj2nid(o: *const ASN1_OBJECT) -> c_int;
+ pub fn OBJ_obj2txt(
+ buf: *mut c_char,
+ buf_len: c_int,
+ a: *const ASN1_OBJECT,
+ no_name: c_int,
+ ) -> c_int;
+
+ pub fn OBJ_find_sigid_algs(signid: c_int, pdig_nid: *mut c_int, ppkey_nid: *mut c_int)
+ -> c_int;
+}

121
lang/rust/files/patch-src_vendor_openssl-sys_src_ocsp.rs Normal file
View file

@ -0,0 +1,121 @@
--- src/vendor/openssl-sys/src/ocsp.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/ocsp.rs
@@ -0,0 +1,118 @@
+use libc::*;
+
+use *;
+
+pub const OCSP_REVOKED_STATUS_NOSTATUS: c_int = -1;
+pub const OCSP_REVOKED_STATUS_UNSPECIFIED: c_int = 0;
+pub const OCSP_REVOKED_STATUS_KEYCOMPROMISE: c_int = 1;
+pub const OCSP_REVOKED_STATUS_CACOMPROMISE: c_int = 2;
+pub const OCSP_REVOKED_STATUS_AFFILIATIONCHANGED: c_int = 3;
+pub const OCSP_REVOKED_STATUS_SUPERSEDED: c_int = 4;
+pub const OCSP_REVOKED_STATUS_CESSATIONOFOPERATION: c_int = 5;
+pub const OCSP_REVOKED_STATUS_CERTIFICATEHOLD: c_int = 6;
+pub const OCSP_REVOKED_STATUS_REMOVEFROMCRL: c_int = 8;
+
+pub const OCSP_NOCERTS: c_ulong = 0x1;
+pub const OCSP_NOINTERN: c_ulong = 0x2;
+pub const OCSP_NOSIGS: c_ulong = 0x4;
+pub const OCSP_NOCHAIN: c_ulong = 0x8;
+pub const OCSP_NOVERIFY: c_ulong = 0x10;
+pub const OCSP_NOEXPLICIT: c_ulong = 0x20;
+pub const OCSP_NOCASIGN: c_ulong = 0x40;
+pub const OCSP_NODELEGATED: c_ulong = 0x80;
+pub const OCSP_NOCHECKS: c_ulong = 0x100;
+pub const OCSP_TRUSTOTHER: c_ulong = 0x200;
+pub const OCSP_RESPID_KEY: c_ulong = 0x400;
+pub const OCSP_NOTIME: c_ulong = 0x800;
+
+pub enum OCSP_CERTID {}
+
+pub enum OCSP_ONEREQ {}
+
+pub enum OCSP_REQUEST {}
+
+pub const OCSP_RESPONSE_STATUS_SUCCESSFUL: c_int = 0;
+pub const OCSP_RESPONSE_STATUS_MALFORMEDREQUEST: c_int = 1;
+pub const OCSP_RESPONSE_STATUS_INTERNALERROR: c_int = 2;
+pub const OCSP_RESPONSE_STATUS_TRYLATER: c_int = 3;
+pub const OCSP_RESPONSE_STATUS_SIGREQUIRED: c_int = 5;
+pub const OCSP_RESPONSE_STATUS_UNAUTHORIZED: c_int = 6;
+
+pub const V_OCSP_CERTSTATUS_GOOD: c_int = 0;
+pub const V_OCSP_CERTSTATUS_REVOKED: c_int = 1;
+pub const V_OCSP_CERTSTATUS_UNKNOWN: c_int = 2;
+
+pub enum OCSP_BASICRESP {}
+
+cfg_if! {
+ if #[cfg(ossl110)] {
+ extern "C" {
+ pub fn OCSP_cert_to_id(
+ dgst: *const EVP_MD,
+ subject: *const X509,
+ issuer: *const X509,
+ ) -> *mut OCSP_CERTID;
+ }
+ } else {
+ extern "C" {
+ pub fn OCSP_cert_to_id(
+ dgst: *const EVP_MD,
+ subject: *mut X509,
+ issuer: *mut X509,
+ ) -> *mut ::OCSP_CERTID;
+ }
+ }
+}
+
+extern "C" {
+ pub fn OCSP_request_add0_id(r: *mut OCSP_REQUEST, id: *mut OCSP_CERTID) -> *mut OCSP_ONEREQ;
+
+ pub fn OCSP_resp_find_status(
+ bs: *mut OCSP_BASICRESP,
+ id: *mut OCSP_CERTID,
+ status: *mut c_int,
+ reason: *mut c_int,
+ revtime: *mut *mut ASN1_GENERALIZEDTIME,
+ thisupd: *mut *mut ASN1_GENERALIZEDTIME,
+ nextupd: *mut *mut ASN1_GENERALIZEDTIME,
+ ) -> c_int;
+ pub fn OCSP_check_validity(
+ thisupd: *mut ASN1_GENERALIZEDTIME,
+ nextupd: *mut ASN1_GENERALIZEDTIME,
+ sec: c_long,
+ maxsec: c_long,
+ ) -> c_int;
+
+ pub fn OCSP_response_status(resp: *mut OCSP_RESPONSE) -> c_int;
+ pub fn OCSP_response_get1_basic(resp: *mut OCSP_RESPONSE) -> *mut OCSP_BASICRESP;
+
+ pub fn OCSP_response_create(status: c_int, bs: *mut OCSP_BASICRESP) -> *mut OCSP_RESPONSE;
+
+ pub fn OCSP_BASICRESP_new() -> *mut OCSP_BASICRESP;
+ pub fn OCSP_BASICRESP_free(r: *mut OCSP_BASICRESP);
+ pub fn OCSP_RESPONSE_new() -> *mut OCSP_RESPONSE;
+ pub fn OCSP_RESPONSE_free(r: *mut OCSP_RESPONSE);
+ pub fn i2d_OCSP_RESPONSE(a: *mut OCSP_RESPONSE, pp: *mut *mut c_uchar) -> c_int;
+ pub fn d2i_OCSP_RESPONSE(
+ a: *mut *mut OCSP_RESPONSE,
+ pp: *mut *const c_uchar,
+ length: c_long,
+ ) -> *mut OCSP_RESPONSE;
+ pub fn OCSP_ONEREQ_free(r: *mut OCSP_ONEREQ);
+ pub fn OCSP_CERTID_free(id: *mut OCSP_CERTID);
+ pub fn OCSP_REQUEST_new() -> *mut OCSP_REQUEST;
+ pub fn OCSP_REQUEST_free(r: *mut OCSP_REQUEST);
+ pub fn i2d_OCSP_REQUEST(a: *mut OCSP_REQUEST, pp: *mut *mut c_uchar) -> c_int;
+ pub fn d2i_OCSP_REQUEST(
+ a: *mut *mut OCSP_REQUEST,
+ pp: *mut *const c_uchar,
+ length: c_long,
+ ) -> *mut OCSP_REQUEST;
+
+ pub fn OCSP_basic_verify(
+ bs: *mut OCSP_BASICRESP,
+ certs: *mut stack_st_X509,
+ st: *mut X509_STORE,
+ flags: c_ulong,
+ ) -> c_int;
+}

86
lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_mod.rs Normal file
View file

@ -0,0 +1,86 @@
--- src/vendor/openssl-sys/src/openssl/mod.rs.orig 2018-09-11 04:49:55 UTC
+++ src/vendor/openssl-sys/src/openssl/mod.rs
@@ -1,83 +0,0 @@
-use libc::{c_int, c_long, c_uchar, c_uint, c_ulong};
-
-#[cfg(not(ossl110))]
-mod v10x;
-#[cfg(not(ossl110))]
-pub use openssl::v10x::*;
-
-#[cfg(ossl110)]
-mod v110;
-#[cfg(ossl110)]
-pub use openssl::v110::*;
-
-#[cfg(ossl111)]
-mod v111;
-#[cfg(ossl111)]
-pub use openssl::v111::*;
-
-#[cfg(ossl102)]
-pub const SSL_CTRL_SET_VERIFY_CERT_STORE: c_int = 106;
-
-pub const SSL_MODE_SEND_CLIENTHELLO_TIME: c_long = 0x20;
-pub const SSL_MODE_SEND_SERVERHELLO_TIME: c_long = 0x40;
-pub const SSL_MODE_SEND_FALLBACK_SCSV: c_long = 0x80;
-
-pub const SSL_OP_SAFARI_ECDHE_ECDSA_BUG: c_ulong = 0x00000040;
-
-pub const SSL_OP_CISCO_ANYCONNECT: c_ulong = 0x00008000;
-pub const SSL_OP_NO_COMPRESSION: c_ulong = 0x00020000;
-pub const SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: c_ulong = 0x00040000;
-pub const SSL_OP_NO_SSLv3: c_ulong = 0x02000000;
-#[cfg(ossl102)]
-pub const SSL_OP_NO_DTLSv1: c_ulong = 0x04000000;
-#[cfg(ossl102)]
-pub const SSL_OP_NO_DTLSv1_2: c_ulong = 0x08000000;
-
-pub const X509_V_ERR_UNSPECIFIED: c_int = 1;
-
-pub const CMS_TEXT: c_uint = 0x1;
-pub const CMS_NOCERTS: c_uint = 0x2;
-pub const CMS_NO_CONTENT_VERIFY: c_uint = 0x4;
-pub const CMS_NO_ATTR_VERIFY: c_uint = 0x8;
-pub const CMS_NOSIGS: c_uint = 0x4 | 0x8;
-pub const CMS_NOINTERN: c_uint = 0x10;
-pub const CMS_NO_SIGNER_CERT_VERIFY: c_uint = 0x20;
-pub const CMS_NOVERIFY: c_uint = 0x20;
-pub const CMS_DETACHED: c_uint = 0x40;
-pub const CMS_BINARY: c_uint = 0x80;
-pub const CMS_NOATTR: c_uint = 0x100;
-pub const CMS_NOSMIMECAP: c_uint = 0x200;
-pub const CMS_NOOLDMIMETYPE: c_uint = 0x400;
-pub const CMS_CRLFEOL: c_uint = 0x800;
-pub const CMS_STREAM: c_uint = 0x1000;
-pub const CMS_NOCRL: c_uint = 0x2000;
-pub const CMS_PARTIAL: c_uint = 0x4000;
-pub const CMS_REUSE_DIGEST: c_uint = 0x8000;
-pub const CMS_USE_KEYID: c_uint = 0x10000;
-pub const CMS_DEBUG_DECRYPT: c_uint = 0x20000;
-#[cfg(ossl102)]
-pub const CMS_KEY_PARAM: c_uint = 0x40000;
-
-extern "C" {
- pub fn CMS_decrypt(
- cms: *mut ::CMS_ContentInfo,
- pkey: *mut ::EVP_PKEY,
- cert: *mut ::X509,
- dcont: *mut ::BIO,
- out: *mut ::BIO,
- flags: c_uint,
- ) -> c_int;
- pub fn SMIME_read_CMS(bio: *mut ::BIO, bcont: *mut *mut ::BIO) -> *mut ::CMS_ContentInfo;
- pub fn CMS_ContentInfo_free(cms: *mut ::CMS_ContentInfo);
- pub fn CMS_sign(
- signcert: *mut ::X509,
- pkey: *mut ::EVP_PKEY,
- certs: *mut ::stack_st_X509,
- data: *mut ::BIO,
- flags: c_uint,
- ) -> *mut ::CMS_ContentInfo;
- pub fn i2d_CMS_ContentInfo(a: *mut ::CMS_ContentInfo, pp: *mut *mut c_uchar) -> c_int;
-
- pub fn FIPS_mode_set(onoff: c_int) -> c_int;
- pub fn FIPS_mode() -> c_int;
-}

1008
lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_v10x.rs Normal file
View file

File diff suppressed because it is too large Load diff

398
lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_v110.rs Normal file
View file

@ -0,0 +1,398 @@
--- src/vendor/openssl-sys/src/openssl/v110.rs.orig 2018-09-11 04:49:55 UTC
+++ src/vendor/openssl-sys/src/openssl/v110.rs
@@ -1,395 +0,0 @@
-use libc::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong, c_void, size_t};
-use std::ptr;
-use std::sync::{Once, ONCE_INIT};
-
-pub enum BIGNUM {}
-pub enum BIO {}
-pub enum BIO_METHOD {}
-pub enum CRYPTO_EX_DATA {}
-pub enum DH {}
-pub enum DSA {}
-pub enum ECDSA_SIG {}
-pub enum EVP_CIPHER {}
-pub enum EVP_MD_CTX {}
-pub enum EVP_PKEY {}
-pub enum HMAC_CTX {}
-pub enum OPENSSL_STACK {}
-pub enum PKCS12 {}
-pub enum RSA {}
-pub enum SSL {}
-pub enum SSL_CTX {}
-pub enum SSL_SESSION {}
-pub enum stack_st_ASN1_OBJECT {}
-pub enum stack_st_GENERAL_NAME {}
-pub enum stack_st_OPENSSL_STRING {}
-pub enum stack_st_void {}
-pub enum stack_st_X509 {}
-pub enum stack_st_X509_NAME {}
-pub enum stack_st_X509_ATTRIBUTE {}
-pub enum stack_st_X509_EXTENSION {}
-pub enum stack_st_SSL_CIPHER {}
-pub enum OPENSSL_INIT_SETTINGS {}
-pub enum X509 {}
-pub enum X509_ALGOR {}
-pub enum X509_VERIFY_PARAM {}
-pub enum X509_REQ {}
-
-pub const CMS_ASCIICRLF: c_uint = 0x80000;
-
-pub const SSL_CTRL_SET_MIN_PROTO_VERSION: c_int = 123;
-pub const SSL_CTRL_SET_MAX_PROTO_VERSION: c_int = 124;
-#[cfg(ossl110g)]
-pub const SSL_CTRL_GET_MIN_PROTO_VERSION: c_int = 130;
-#[cfg(ossl110g)]
-pub const SSL_CTRL_GET_MAX_PROTO_VERSION: c_int = 131;
-
-pub const SSL_OP_MICROSOFT_SESS_ID_BUG: c_ulong = 0x00000000;
-pub const SSL_OP_NETSCAPE_CHALLENGE_BUG: c_ulong = 0x00000000;
-pub const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: c_ulong = 0x00000000;
-pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: c_ulong = 0x00000000;
-pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: c_ulong = 0x00000000;
-pub const SSL_OP_TLS_D5_BUG: c_ulong = 0x00000000;
-pub const SSL_OP_TLS_BLOCK_PADDING_BUG: c_ulong = 0x00000000;
-pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x00000000;
-pub const SSL_OP_SINGLE_DH_USE: c_ulong = 0x00000000;
-pub const SSL_OP_NO_SSLv2: c_ulong = 0x00000000;
-
-pub const OPENSSL_VERSION: c_int = 0;
-pub const OPENSSL_CFLAGS: c_int = 1;
-pub const OPENSSL_BUILT_ON: c_int = 2;
-pub const OPENSSL_PLATFORM: c_int = 3;
-pub const OPENSSL_DIR: c_int = 4;
-
-pub const CRYPTO_EX_INDEX_SSL: c_int = 0;
-pub const CRYPTO_EX_INDEX_SSL_CTX: c_int = 1;
-
-pub const OPENSSL_INIT_LOAD_SSL_STRINGS: u64 = 0x00200000;
-
-pub const X509_V_ERR_DANE_NO_MATCH: c_int = 65;
-pub const X509_V_ERR_EE_KEY_TOO_SMALL: c_int = 66;
-pub const X509_V_ERR_CA_KEY_TOO_SMALL: c_int = 67;
-pub const X509_V_ERR_CA_MD_TOO_WEAK: c_int = 68;
-pub const X509_V_ERR_INVALID_CALL: c_int = 69;
-pub const X509_V_ERR_STORE_LOOKUP: c_int = 70;
-pub const X509_V_ERR_NO_VALID_SCTS: c_int = 71;
-
-pub const X509_CHECK_FLAG_NEVER_CHECK_SUBJECT: c_uint = 0x20;
-
-pub fn init() {
- // explicitly initialize to work around https://github.com/openssl/openssl/issues/3505
- static INIT: Once = ONCE_INIT;
-
- INIT.call_once(|| unsafe {
- OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, ptr::null_mut());
- })
-}
-
-pub unsafe fn SSL_CTX_set_min_proto_version(ctx: *mut ::SSL_CTX, version: c_int) -> c_int {
- ::SSL_CTX_ctrl(
- ctx,
- SSL_CTRL_SET_MIN_PROTO_VERSION,
- version as c_long,
- ptr::null_mut(),
- ) as c_int
-}
-
-pub unsafe fn SSL_CTX_set_max_proto_version(ctx: *mut ::SSL_CTX, version: c_int) -> c_int {
- ::SSL_CTX_ctrl(
- ctx,
- SSL_CTRL_SET_MAX_PROTO_VERSION,
- version as c_long,
- ptr::null_mut(),
- ) as c_int
-}
-
-#[cfg(ossl110g)]
-pub unsafe fn SSL_CTX_get_min_proto_version(ctx: *mut ::SSL_CTX) -> c_int {
- ::SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, ptr::null_mut()) as c_int
-}
-
-#[cfg(ossl110g)]
-pub unsafe fn SSL_CTX_get_max_proto_version(ctx: *mut ::SSL_CTX) -> c_int {
- ::SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, ptr::null_mut()) as c_int
-}
-
-pub unsafe fn SSL_set_min_proto_version(s: *mut ::SSL, version: c_int) -> c_int {
- ::SSL_ctrl(
- s,
- SSL_CTRL_SET_MIN_PROTO_VERSION,
- version as c_long,
- ptr::null_mut(),
- ) as c_int
-}
-
-pub unsafe fn SSL_set_max_proto_version(s: *mut ::SSL, version: c_int) -> c_int {
- ::SSL_ctrl(
- s,
- SSL_CTRL_SET_MAX_PROTO_VERSION,
- version as c_long,
- ptr::null_mut(),
- ) as c_int
-}
-
-#[cfg(ossl110g)]
-pub unsafe fn SSL_get_min_proto_version(s: *mut ::SSL) -> c_int {
- ::SSL_ctrl(s, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, ptr::null_mut()) as c_int
-}
-
-#[cfg(ossl110g)]
-pub unsafe fn SSL_get_max_proto_version(s: *mut ::SSL) -> c_int {
- ::SSL_ctrl(s, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, ptr::null_mut()) as c_int
-}
-
-extern "C" {
- pub fn BIO_new(type_: *const BIO_METHOD) -> *mut BIO;
- pub fn BIO_s_file() -> *const BIO_METHOD;
- pub fn BIO_s_mem() -> *const BIO_METHOD;
-
- pub fn BN_get_rfc2409_prime_768(bn: *mut BIGNUM) -> *mut BIGNUM;
- pub fn BN_get_rfc2409_prime_1024(bn: *mut BIGNUM) -> *mut BIGNUM;
- pub fn BN_get_rfc3526_prime_1536(bn: *mut BIGNUM) -> *mut BIGNUM;
- pub fn BN_get_rfc3526_prime_2048(bn: *mut BIGNUM) -> *mut BIGNUM;
- pub fn BN_get_rfc3526_prime_3072(bn: *mut BIGNUM) -> *mut BIGNUM;
- pub fn BN_get_rfc3526_prime_4096(bn: *mut BIGNUM) -> *mut BIGNUM;
- pub fn BN_get_rfc3526_prime_6144(bn: *mut BIGNUM) -> *mut BIGNUM;
- pub fn BN_get_rfc3526_prime_8192(bn: *mut BIGNUM) -> *mut BIGNUM;
-
- pub fn CRYPTO_malloc(num: size_t, file: *const c_char, line: c_int) -> *mut c_void;
- pub fn CRYPTO_free(buf: *mut c_void, file: *const c_char, line: c_int);
-
- pub fn EVP_chacha20() -> *const ::EVP_CIPHER;
- pub fn EVP_chacha20_poly1305() -> *const ::EVP_CIPHER;
-
- pub fn HMAC_CTX_new() -> *mut HMAC_CTX;
- pub fn HMAC_CTX_free(ctx: *mut HMAC_CTX);
-
- pub fn OCSP_cert_to_id(
- dgst: *const ::EVP_MD,
- subject: *const ::X509,
- issuer: *const ::X509,
- ) -> *mut ::OCSP_CERTID;
-
- pub fn TLS_method() -> *const ::SSL_METHOD;
- pub fn DTLS_method() -> *const ::SSL_METHOD;
- pub fn SSL_CIPHER_get_version(cipher: *const ::SSL_CIPHER) -> *const c_char;
- pub fn X509_get_subject_name(x: *const ::X509) -> *mut ::X509_NAME;
- pub fn X509_get_issuer_name(x: *const ::X509) -> *mut ::X509_NAME;
- pub fn X509_set1_notAfter(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int;
- pub fn X509_set1_notBefore(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int;
- pub fn X509_get_ext_d2i(
- x: *const ::X509,
- nid: c_int,
- crit: *mut c_int,
- idx: *mut c_int,
- ) -> *mut c_void;
- pub fn X509_NAME_add_entry_by_NID(
- x: *mut ::X509_NAME,
- field: c_int,
- ty: c_int,
- bytes: *const c_uchar,
- len: c_int,
- loc: c_int,
- set: c_int,
- ) -> c_int;
- pub fn X509_get_signature_nid(x: *const X509) -> c_int;
- pub fn X509_ALGOR_get0(
- paobj: *mut *const ::ASN1_OBJECT,
- pptype: *mut c_int,
- ppval: *mut *const c_void,
- alg: *const ::X509_ALGOR,
- );
- pub fn X509_NAME_entry_count(n: *const ::X509_NAME) -> c_int;
- pub fn X509_NAME_get_entry(n: *const ::X509_NAME, loc: c_int) -> *mut ::X509_NAME_ENTRY;
- pub fn X509_NAME_ENTRY_get_data(ne: *const ::X509_NAME_ENTRY) -> *mut ::ASN1_STRING;
- pub fn X509_NAME_ENTRY_get_object(ne: *const ::X509_NAME_ENTRY) -> *mut ::ASN1_OBJECT;
- pub fn X509V3_EXT_nconf_nid(
- conf: *mut ::CONF,
- ctx: *mut ::X509V3_CTX,
- ext_nid: c_int,
- value: *const c_char,
- ) -> *mut ::X509_EXTENSION;
- pub fn X509V3_EXT_nconf(
- conf: *mut ::CONF,
- ctx: *mut ::X509V3_CTX,
- name: *const c_char,
- value: *const c_char,
- ) -> *mut ::X509_EXTENSION;
- pub fn ASN1_STRING_to_UTF8(out: *mut *mut c_uchar, s: *const ::ASN1_STRING) -> c_int;
- pub fn BN_is_negative(b: *const ::BIGNUM) -> c_int;
- pub fn EVP_CIPHER_key_length(cipher: *const EVP_CIPHER) -> c_int;
- pub fn EVP_CIPHER_block_size(cipher: *const EVP_CIPHER) -> c_int;
- pub fn EVP_CIPHER_iv_length(cipher: *const EVP_CIPHER) -> c_int;
- pub fn EVP_PBE_scrypt(
- pass: *const c_char,
- passlen: size_t,
- salt: *const c_uchar,
- saltlen: size_t,
- N: u64,
- r: u64,
- p: u64,
- maxmem: u64,
- key: *mut c_uchar,
- keylen: size_t,
- ) -> c_int;
- pub fn DSA_get0_pqg(
- d: *const ::DSA,
- p: *mut *const ::BIGNUM,
- q: *mut *const ::BIGNUM,
- q: *mut *const ::BIGNUM,
- );
- pub fn DSA_set0_pqg(
- d: *mut ::DSA,
- p: *mut ::BIGNUM,
- q: *mut ::BIGNUM,
- q: *mut ::BIGNUM,
- ) -> c_int;
- pub fn DSA_get0_key(
- d: *const ::DSA,
- pub_key: *mut *const ::BIGNUM,
- priv_key: *mut *const ::BIGNUM,
- );
- pub fn DSA_set0_key(
- d: *mut ::DSA,
- pub_key: *mut ::BIGNUM,
- priv_key: *mut ::BIGNUM,
- ) -> c_int;
- pub fn RSA_get0_key(
- r: *const ::RSA,
- n: *mut *const ::BIGNUM,
- e: *mut *const ::BIGNUM,
- d: *mut *const ::BIGNUM,
- );
- pub fn RSA_get0_factors(r: *const ::RSA, p: *mut *const ::BIGNUM, q: *mut *const ::BIGNUM);
- pub fn RSA_get0_crt_params(
- r: *const ::RSA,
- dmp1: *mut *const ::BIGNUM,
- dmq1: *mut *const ::BIGNUM,
- iqmp: *mut *const ::BIGNUM,
- );
- pub fn RSA_set0_key(
- r: *mut ::RSA,
- n: *mut ::BIGNUM,
- e: *mut ::BIGNUM,
- d: *mut ::BIGNUM,
- ) -> c_int;
- pub fn RSA_set0_factors(r: *mut ::RSA, p: *mut ::BIGNUM, q: *mut ::BIGNUM) -> c_int;
- pub fn RSA_set0_crt_params(
- r: *mut ::RSA,
- dmp1: *mut ::BIGNUM,
- dmq1: *mut ::BIGNUM,
- iqmp: *mut ::BIGNUM,
- ) -> c_int;
- pub fn ASN1_STRING_get0_data(x: *const ::ASN1_STRING) -> *const c_uchar;
- pub fn OPENSSL_sk_num(stack: *const ::OPENSSL_STACK) -> c_int;
- pub fn OPENSSL_sk_value(stack: *const ::OPENSSL_STACK, idx: c_int) -> *mut c_void;
- pub fn SSL_CTX_get_options(ctx: *const ::SSL_CTX) -> c_ulong;
- pub fn SSL_CTX_set_options(ctx: *mut ::SSL_CTX, op: c_ulong) -> c_ulong;
- pub fn SSL_CTX_clear_options(ctx: *mut ::SSL_CTX, op: c_ulong) -> c_ulong;
- pub fn SSL_CTX_sess_set_get_cb(
- ctx: *mut ::SSL_CTX,
- get_session_cb: Option<
- unsafe extern "C" fn(*mut ::SSL, *const c_uchar, c_int, *mut c_int) -> *mut SSL_SESSION,
- >,
- );
- pub fn SSL_get_client_random(ssl: *const SSL, out: *mut c_uchar, len: size_t) -> size_t;
- pub fn SSL_get_server_random(ssl: *const SSL, out: *mut c_uchar, len: size_t) -> size_t;
- pub fn SSL_get0_verified_chain(ssl: *const SSL) -> *mut stack_st_X509;
- pub fn X509_getm_notAfter(x: *const ::X509) -> *mut ::ASN1_TIME;
- pub fn X509_getm_notBefore(x: *const ::X509) -> *mut ::ASN1_TIME;
- pub fn X509_get0_signature(
- psig: *mut *const ::ASN1_BIT_STRING,
- palg: *mut *const ::X509_ALGOR,
- x: *const ::X509,
- );
- pub fn DH_set0_pqg(
- dh: *mut ::DH,
- p: *mut ::BIGNUM,
- q: *mut ::BIGNUM,
- g: *mut ::BIGNUM,
- ) -> c_int;
- pub fn BIO_set_init(a: *mut ::BIO, init: c_int);
- pub fn BIO_set_data(a: *mut ::BIO, data: *mut c_void);
- pub fn BIO_get_data(a: *mut ::BIO) -> *mut c_void;
- pub fn BIO_meth_new(type_: c_int, name: *const c_char) -> *mut ::BIO_METHOD;
- pub fn BIO_meth_free(biom: *mut ::BIO_METHOD);
- // FIXME should wrap in Option
- pub fn BIO_meth_set_write(
- biom: *mut ::BIO_METHOD,
- write: unsafe extern "C" fn(*mut ::BIO, *const c_char, c_int) -> c_int,
- ) -> c_int;
- pub fn BIO_meth_set_read(
- biom: *mut ::BIO_METHOD,
- read: unsafe extern "C" fn(*mut ::BIO, *mut c_char, c_int) -> c_int,
- ) -> c_int;
- pub fn BIO_meth_set_puts(
- biom: *mut ::BIO_METHOD,
- read: unsafe extern "C" fn(*mut ::BIO, *const c_char) -> c_int,
- ) -> c_int;
- pub fn BIO_meth_set_ctrl(
- biom: *mut ::BIO_METHOD,
- read: unsafe extern "C" fn(*mut ::BIO, c_int, c_long, *mut c_void) -> c_long,
- ) -> c_int;
- pub fn BIO_meth_set_create(
- biom: *mut ::BIO_METHOD,
- create: unsafe extern "C" fn(*mut ::BIO) -> c_int,
- ) -> c_int;
- pub fn BIO_meth_set_destroy(
- biom: *mut ::BIO_METHOD,
- destroy: unsafe extern "C" fn(*mut ::BIO) -> c_int,
- ) -> c_int;
- pub fn CRYPTO_get_ex_new_index(
- class_index: c_int,
- argl: c_long,
- argp: *mut c_void,
- new_func: Option<::CRYPTO_EX_new>,
- dup_func: Option<::CRYPTO_EX_dup>,
- free_func: Option<::CRYPTO_EX_free>,
- ) -> c_int;
- pub fn X509_up_ref(x: *mut X509) -> c_int;
- pub fn SSL_CTX_up_ref(x: *mut SSL_CTX) -> c_int;
- pub fn SSL_session_reused(ssl: *mut SSL) -> c_int;
- pub fn SSL_SESSION_get_master_key(
- session: *const SSL_SESSION,
- out: *mut c_uchar,
- outlen: size_t,
- ) -> size_t;
- pub fn SSL_SESSION_up_ref(ses: *mut SSL_SESSION) -> c_int;
- pub fn X509_get0_extensions(req: *const ::X509) -> *const stack_st_X509_EXTENSION;
- pub fn X509_STORE_CTX_get0_chain(ctx: *mut ::X509_STORE_CTX) -> *mut stack_st_X509;
- pub fn EVP_MD_CTX_new() -> *mut EVP_MD_CTX;
- pub fn EVP_MD_CTX_free(ctx: *mut EVP_MD_CTX);
- pub fn EVP_PKEY_bits(key: *const EVP_PKEY) -> c_int;
-
- pub fn OpenSSL_version_num() -> c_ulong;
- pub fn OpenSSL_version(key: c_int) -> *const c_char;
- pub fn OPENSSL_init_ssl(opts: u64, settings: *const OPENSSL_INIT_SETTINGS) -> c_int;
- pub fn OPENSSL_sk_new_null() -> *mut ::OPENSSL_STACK;
- pub fn OPENSSL_sk_free(st: *mut ::OPENSSL_STACK);
- pub fn OPENSSL_sk_pop_free(
- st: *mut ::OPENSSL_STACK,
- free: Option<unsafe extern "C" fn(*mut c_void)>,
- );
- pub fn OPENSSL_sk_push(st: *mut ::OPENSSL_STACK, data: *const c_void) -> c_int;
- pub fn OPENSSL_sk_pop(st: *mut ::OPENSSL_STACK) -> *mut c_void;
-
- pub fn PKCS12_create(
- pass: *const c_char,
- friendly_name: *const c_char,
- pkey: *mut EVP_PKEY,
- cert: *mut X509,
- ca: *mut stack_st_X509,
- nid_key: c_int,
- nid_cert: c_int,
- iter: c_int,
- mac_iter: c_int,
- keytype: c_int,
- ) -> *mut PKCS12;
- pub fn X509_REQ_get_version(req: *const X509_REQ) -> c_long;
- pub fn X509_REQ_get_subject_name(req: *const X509_REQ) -> *mut ::X509_NAME;
- pub fn SSL_extension_supported(ext_type: c_uint) -> c_int;
- pub fn ECDSA_SIG_get0(sig: *const ECDSA_SIG, pr: *mut *const BIGNUM, ps: *mut *const BIGNUM);
- pub fn ECDSA_SIG_set0(sig: *mut ECDSA_SIG, pr: *mut BIGNUM, ps: *mut BIGNUM) -> c_int;
-
- pub fn SSL_CIPHER_get_cipher_nid(c: *const ::SSL_CIPHER) -> c_int;
- pub fn SSL_CIPHER_get_digest_nid(c: *const ::SSL_CIPHER) -> c_int;
-}

140
lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_v111.rs Normal file
View file

@ -0,0 +1,140 @@
--- src/vendor/openssl-sys/src/openssl/v111.rs.orig 2018-09-11 04:49:55 UTC
+++ src/vendor/openssl-sys/src/openssl/v111.rs
@@ -1,137 +0,0 @@
-use libc::{c_char, c_int, c_uchar, c_uint, c_ulong, c_void, size_t};
-
-pub type SSL_CTX_keylog_cb_func =
- Option<unsafe extern "C" fn(ssl: *const ::SSL, line: *const c_char)>;
-
-pub type SSL_custom_ext_add_cb_ex = Option<
- unsafe extern "C" fn(
- ssl: *mut ::SSL,
- ext_type: c_uint,
- context: c_uint,
- out: *mut *const c_uchar,
- outlen: *mut size_t,
- x: *mut ::X509,
- chainidx: size_t,
- al: *mut c_int,
- add_arg: *mut c_void,
- ) -> c_int,
->;
-
-pub type SSL_custom_ext_free_cb_ex = Option<
- unsafe extern "C" fn(
- ssl: *mut ::SSL,
- ext_type: c_uint,
- context: c_uint,
- out: *mut *const c_uchar,
- add_arg: *mut c_void,
- ),
->;
-
-pub type SSL_custom_ext_parse_cb_ex = Option<
- unsafe extern "C" fn(
- ssl: *mut ::SSL,
- ext_type: c_uint,
- context: c_uint,
- input: *const c_uchar,
- inlen: size_t,
- x: *mut ::X509,
- chainidx: size_t,
- al: *mut c_int,
- parse_arg: *mut c_void,
- ) -> c_int,
->;
-
-pub const SSL_COOKIE_LENGTH: c_int = 4096;
-
-pub const SSL_OP_ENABLE_MIDDLEBOX_COMPAT: c_ulong = 0x00100000;
-pub const SSL_OP_NO_TLSv1_3: c_ulong = 0x20000000;
-
-pub const TLS1_3_VERSION: c_int = 0x304;
-
-pub const SSL_EXT_TLS_ONLY: c_uint = 0x0001;
-/* This extension is only allowed in DTLS */
-pub const SSL_EXT_DTLS_ONLY: c_uint = 0x0002;
-/* Some extensions may be allowed in DTLS but we don't implement them for it */
-pub const SSL_EXT_TLS_IMPLEMENTATION_ONLY: c_uint = 0x0004;
-/* Most extensions are not defined for SSLv3 but EXT_TYPE_renegotiate is */
-pub const SSL_EXT_SSL3_ALLOWED: c_uint = 0x0008;
-/* Extension is only defined for TLS1.2 and below */
-pub const SSL_EXT_TLS1_2_AND_BELOW_ONLY: c_uint = 0x0010;
-/* Extension is only defined for TLS1.3 and above */
-pub const SSL_EXT_TLS1_3_ONLY: c_uint = 0x0020;
-/* Ignore this extension during parsing if we are resuming */
-pub const SSL_EXT_IGNORE_ON_RESUMPTION: c_uint = 0x0040;
-pub const SSL_EXT_CLIENT_HELLO: c_uint = 0x0080;
-/* Really means TLS1.2 or below */
-pub const SSL_EXT_TLS1_2_SERVER_HELLO: c_uint = 0x0100;
-pub const SSL_EXT_TLS1_3_SERVER_HELLO: c_uint = 0x0200;
-pub const SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS: c_uint = 0x0400;
-pub const SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST: c_uint = 0x0800;
-pub const SSL_EXT_TLS1_3_CERTIFICATE: c_uint = 0x1000;
-pub const SSL_EXT_TLS1_3_NEW_SESSION_TICKET: c_uint = 0x2000;
-pub const SSL_EXT_TLS1_3_CERTIFICATE_REQUEST: c_uint = 0x4000;
-
-pub const SSL_READ_EARLY_DATA_ERROR: c_int = 0;
-pub const SSL_READ_EARLY_DATA_SUCCESS: c_int = 1;
-pub const SSL_READ_EARLY_DATA_FINISH: c_int = 2;
-
-extern "C" {
- pub fn SSL_CTX_set_keylog_callback(ctx: *mut ::SSL_CTX, cb: SSL_CTX_keylog_cb_func);
- pub fn SSL_CTX_add_custom_ext(
- ctx: *mut ::SSL_CTX,
- ext_type: c_uint,
- context: c_uint,
- add_cb: SSL_custom_ext_add_cb_ex,
- free_cb: SSL_custom_ext_free_cb_ex,
- add_arg: *mut c_void,
- parse_cb: SSL_custom_ext_parse_cb_ex,
- parse_arg: *mut c_void,
- ) -> c_int;
- pub fn SSL_CIPHER_get_handshake_digest(cipher: *const ::SSL_CIPHER) -> *const ::EVP_MD;
- pub fn SSL_CTX_set_stateless_cookie_generate_cb(
- s: *mut ::SSL_CTX,
- cb: Option<
- unsafe extern "C" fn(ssl: *mut ::SSL, cookie: *mut c_uchar, cookie_len: *mut size_t)
- -> c_int,
- >,
- );
- pub fn SSL_CTX_set_stateless_cookie_verify_cb(
- s: *mut ::SSL_CTX,
- cb: Option<
- unsafe extern "C" fn(ssl: *mut ::SSL, cookie: *const c_uchar, cookie_len: size_t)
- -> c_int,
- >,
- );
- pub fn SSL_CTX_set_max_early_data(ctx: *mut ::SSL_CTX, max_early_data: u32) -> c_int;
- pub fn SSL_CTX_get_max_early_data(ctx: *const ::SSL_CTX) -> u32;
- pub fn SSL_CTX_set_ciphersuites(ctx: *mut ::SSL_CTX, str: *const c_char) -> c_int;
-
- pub fn SSL_set_max_early_data(ctx: *mut ::SSL, max_early_data: u32) -> c_int;
- pub fn SSL_get_max_early_data(ctx: *const ::SSL) -> u32;
- pub fn SSL_stateless(s: *mut ::SSL) -> c_int;
- pub fn SSL_export_keying_material_early(
- s: *mut ::SSL,
- out: *mut c_uchar,
- olen: size_t,
- label: *const c_char,
- llen: size_t,
- context: *const c_uchar,
- contextlen: size_t,
- ) -> c_int;
- pub fn SSL_write_early_data(
- s: *mut ::SSL,
- buf: *const c_void,
- num: size_t,
- written: *mut size_t,
- ) -> c_int;
- pub fn SSL_read_early_data(
- s: *mut ::SSL,
- buf: *mut c_void,
- num: size_t,
- readbytes: *mut size_t,
- ) -> c_int;
- pub fn SSL_set_ciphersuites(ssl: *mut ::SSL, str: *const c_char) -> c_int;
-
- pub fn SSL_SESSION_set_max_early_data(ctx: *mut ::SSL_SESSION, max_early_data: u32) -> c_int;
- pub fn SSL_SESSION_get_max_early_data(ctx: *const ::SSL_SESSION) -> u32;
-}

992
lang/rust/files/patch-src_vendor_openssl-sys_src_ossl__typ.rs Normal file
View file

@ -0,0 +1,992 @@
--- src/vendor/openssl-sys/src/ossl_typ.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/ossl_typ.rs
@@ -0,0 +1,989 @@
+use libc::*;
+
+#[allow(unused_imports)]
+use *;
+
+pub enum ASN1_INTEGER {}
+pub enum ASN1_GENERALIZEDTIME {}
+pub enum ASN1_STRING {}
+pub enum ASN1_BIT_STRING {}
+pub enum ASN1_TIME {}
+pub enum ASN1_TYPE {}
+pub enum ASN1_OBJECT {}
+
+pub enum bio_st {} // FIXME remove
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ pub enum BIO {}
+ } else {
+ #[repr(C)]
+ pub struct BIO {
+ pub method: *mut BIO_METHOD,
+ pub callback: Option<
+ unsafe extern "C" fn(*mut BIO, c_int, *const c_char, c_int, c_long, c_long) -> c_long,
+ >,
+ pub cb_arg: *mut c_char,
+ pub init: c_int,
+ pub shutdown: c_int,
+ pub flags: c_int,
+ pub retry_reason: c_int,
+ pub num: c_int,
+ pub ptr: *mut c_void,
+ pub next_bio: *mut BIO,
+ pub prev_bio: *mut BIO,
+ pub references: c_int,
+ pub num_read: c_ulong,
+ pub num_write: c_ulong,
+ pub ex_data: CRYPTO_EX_DATA,
+ }
+ }
+}
+cfg_if! {
+ if #[cfg(ossl110)] {
+ pub enum BIGNUM {}
+ } else {
+ #[repr(C)]
+ pub struct BIGNUM {
+ pub d: *mut BN_ULONG,
+ pub top: c_int,
+ pub dmax: c_int,
+ pub neg: c_int,
+ pub flags: c_int,
+ }
+ }
+}
+pub enum BN_BLINDING {}
+pub enum BN_MONT_CTX {}
+
+pub enum BN_CTX {}
+pub enum BN_GENCB {}
+
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ pub enum EVP_CIPHER {}
+ } else {
+ #[repr(C)]
+ pub struct EVP_CIPHER {
+ pub nid: c_int,
+ pub block_size: c_int,
+ pub key_len: c_int,
+ pub iv_len: c_int,
+ pub flags: c_ulong,
+ pub init: Option<
+ unsafe extern "C" fn(*mut EVP_CIPHER_CTX, *const c_uchar, *const c_uchar, c_int) -> c_int,
+ >,
+ pub do_cipher: Option<
+ unsafe extern "C" fn(*mut EVP_CIPHER_CTX, *mut c_uchar, *const c_uchar, size_t) -> c_int,
+ >,
+ pub cleanup: Option<unsafe extern "C" fn(*mut EVP_CIPHER_CTX) -> c_int>,
+ pub ctx_size: c_int,
+ pub set_asn1_parameters:
+ Option<unsafe extern "C" fn(*mut EVP_CIPHER_CTX, *mut ASN1_TYPE) -> c_int>,
+ pub get_asn1_parameters:
+ Option<unsafe extern "C" fn(*mut EVP_CIPHER_CTX, *mut ASN1_TYPE) -> c_int>,
+ pub ctrl:
+ Option<unsafe extern "C" fn(*mut EVP_CIPHER_CTX, c_int, c_int, *mut c_void) -> c_int>,
+ pub app_data: *mut c_void,
+ }
+ }
+}
+pub enum EVP_CIPHER_CTX {}
+pub enum EVP_MD {}
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ pub enum EVP_MD_CTX {}
+ } else {
+ #[repr(C)]
+ pub struct EVP_MD_CTX {
+ digest: *mut EVP_MD,
+ engine: *mut ENGINE,
+ flags: c_ulong,
+ md_data: *mut c_void,
+ pctx: *mut EVP_PKEY_CTX,
+ update: *mut c_void,
+ }
+ }
+}
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ pub enum EVP_PKEY {}
+ } else {
+ #[repr(C)]
+ pub struct EVP_PKEY {
+ pub type_: c_int,
+ pub save_type: c_int,
+ pub references: c_int,
+ pub ameth: *const EVP_PKEY_ASN1_METHOD,
+ pub engine: *mut ENGINE,
+ pub pkey: *mut c_void,
+ pub save_parameters: c_int,
+ pub attributes: *mut stack_st_X509_ATTRIBUTE,
+ }
+ }
+}
+
+pub enum EVP_PKEY_ASN1_METHOD {}
+
+pub enum EVP_PKEY_CTX {}
+
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ pub enum HMAC_CTX {}
+ } else {
+ #[repr(C)]
+ pub struct HMAC_CTX {
+ md: *mut EVP_MD,
+ md_ctx: EVP_MD_CTX,
+ i_ctx: EVP_MD_CTX,
+ o_ctx: EVP_MD_CTX,
+ key_length: c_uint,
+ key: [c_uchar; 128],
+ }
+ }
+}
+
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ pub enum DH {}
+ } else {
+ #[repr(C)]
+ pub struct DH {
+ pub pad: c_int,
+ pub version: c_int,
+ pub p: *mut ::BIGNUM,
+ pub g: *mut ::BIGNUM,
+ pub length: c_long,
+ pub pub_key: *mut ::BIGNUM,
+ pub priv_key: *mut ::BIGNUM,
+ pub flags: c_int,
+ pub method_mont_p: *mut ::BN_MONT_CTX,
+ pub q: *mut ::BIGNUM,
+ pub j: *mut ::BIGNUM,
+ pub seed: *mut c_uchar,
+ pub seedlen: c_int,
+ pub counter: *mut ::BIGNUM,
+ pub references: c_int,
+ pub ex_data: ::CRYPTO_EX_DATA,
+ pub meth: *const ::DH_METHOD,
+ pub engine: *mut ::ENGINE,
+ }
+ }
+}
+pub enum DH_METHOD {}
+
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ pub enum DSA {}
+ } else {
+ #[repr(C)]
+ pub struct DSA {
+ pub pad: c_int,
+ pub version: c_long,
+ pub write_params: c_int,
+
+ pub p: *mut BIGNUM,
+ pub q: *mut BIGNUM,
+ pub g: *mut BIGNUM,
+ pub pub_key: *mut BIGNUM,
+ pub priv_key: *mut BIGNUM,
+ pub kinv: *mut BIGNUM,
+ pub r: *mut BIGNUM,
+
+ pub flags: c_int,
+ pub method_mont_p: *mut BN_MONT_CTX,
+ pub references: c_int,
+ pub ex_data: CRYPTO_EX_DATA,
+ pub meth: *const DSA_METHOD,
+ pub engine: *mut ENGINE,
+ }
+ }
+}
+pub enum DSA_METHOD {}
+
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ pub enum RSA {}
+ } else if #[cfg(libressl)] {
+ #[repr(C)]
+ pub struct RSA {
+ pub pad: c_int,
+ pub version: c_long,
+ pub meth: *const ::RSA_METHOD,
+
+ pub engine: *mut ::ENGINE,
+ pub n: *mut ::BIGNUM,
+ pub e: *mut ::BIGNUM,
+ pub d: *mut ::BIGNUM,
+ pub p: *mut ::BIGNUM,
+ pub q: *mut ::BIGNUM,
+ pub dmp1: *mut ::BIGNUM,
+ pub dmq1: *mut ::BIGNUM,
+ pub iqmp: *mut ::BIGNUM,
+
+ pub ex_data: ::CRYPTO_EX_DATA,
+ pub references: c_int,
+ pub flags: c_int,
+
+ pub _method_mod_n: *mut ::BN_MONT_CTX,
+ pub _method_mod_p: *mut ::BN_MONT_CTX,
+ pub _method_mod_q: *mut ::BN_MONT_CTX,
+
+ pub blinding: *mut ::BN_BLINDING,
+ pub mt_blinding: *mut ::BN_BLINDING,
+ }
+ } else {
+ #[repr(C)]
+ pub struct RSA {
+ pub pad: c_int,
+ pub version: c_long,
+ pub meth: *const ::RSA_METHOD,
+
+ pub engine: *mut ::ENGINE,
+ pub n: *mut ::BIGNUM,
+ pub e: *mut ::BIGNUM,
+ pub d: *mut ::BIGNUM,
+ pub p: *mut ::BIGNUM,
+ pub q: *mut ::BIGNUM,
+ pub dmp1: *mut ::BIGNUM,
+ pub dmq1: *mut ::BIGNUM,
+ pub iqmp: *mut ::BIGNUM,
+
+ pub ex_data: ::CRYPTO_EX_DATA,
+ pub references: c_int,
+ pub flags: c_int,
+
+ pub _method_mod_n: *mut ::BN_MONT_CTX,
+ pub _method_mod_p: *mut ::BN_MONT_CTX,
+ pub _method_mod_q: *mut ::BN_MONT_CTX,
+
+ pub bignum_data: *mut c_char,
+ pub blinding: *mut ::BN_BLINDING,
+ pub mt_blinding: *mut ::BN_BLINDING,
+ }
+ }
+}
+pub enum RSA_METHOD {}
+
+pub enum EC_KEY {}
+
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ pub enum X509 {}
+ } else if #[cfg(libressl)] {
+ #[repr(C)]
+ pub struct X509 {
+ pub cert_info: *mut X509_CINF,
+ pub sig_alg: *mut ::X509_ALGOR,
+ pub signature: *mut ::ASN1_BIT_STRING,
+ pub valid: c_int,
+ pub references: c_int,
+ pub name: *mut c_char,
+ pub ex_data: ::CRYPTO_EX_DATA,
+ pub ex_pathlen: c_long,
+ pub ex_pcpathlen: c_long,
+ pub ex_flags: c_ulong,
+ pub ex_kusage: c_ulong,
+ pub ex_xkusage: c_ulong,
+ pub ex_nscert: c_ulong,
+ skid: *mut c_void,
+ akid: *mut c_void,
+ policy_cache: *mut c_void,
+ crldp: *mut c_void,
+ altname: *mut c_void,
+ nc: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_SHA"))]
+ sha1_hash: [c_uchar; 20],
+ aux: *mut c_void,
+ }
+ } else {
+ #[repr(C)]
+ pub struct X509 {
+ pub cert_info: *mut X509_CINF,
+ pub sig_alg: *mut X509_ALGOR,
+ pub signature: *mut ASN1_BIT_STRING,
+ pub valid: c_int,
+ pub references: c_int,
+ pub name: *mut c_char,
+ pub ex_data: CRYPTO_EX_DATA,
+ pub ex_pathlen: c_long,
+ pub ex_pcpathlen: c_long,
+ pub ex_flags: c_ulong,
+ pub ex_kusage: c_ulong,
+ pub ex_xkusage: c_ulong,
+ pub ex_nscert: c_ulong,
+ skid: *mut c_void,
+ akid: *mut c_void,
+ policy_cache: *mut c_void,
+ crldp: *mut c_void,
+ altname: *mut c_void,
+ nc: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_RFC3779"))]
+ rfc3779_addr: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_RFC3779"))]
+ rfc3779_asid: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_SHA"))]
+ sha1_hash: [c_uchar; 20],
+ aux: *mut c_void,
+ }
+ }
+}
+cfg_if! {
+ if #[cfg(ossl110)] {
+ pub enum X509_ALGOR {}
+ } else {
+ #[repr(C)]
+ pub struct X509_ALGOR {
+ pub algorithm: *mut ::ASN1_OBJECT,
+ parameter: *mut c_void,
+ }
+ }
+}
+pub enum X509_CRL {}
+pub enum X509_NAME {}
+pub enum X509_STORE {}
+pub enum X509_STORE_CTX {}
+
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ pub enum X509_VERIFY_PARAM {}
+ } else if #[cfg(libressl251)] {
+ #[repr(C)]
+ pub struct X509_VERIFY_PARAM {
+ pub name: *mut c_char,
+ pub check_time: time_t,
+ pub inh_flags: c_ulong,
+ pub flags: c_ulong,
+ pub purpose: c_int,
+ pub trust: c_int,
+ pub depth: c_int,
+ pub policies: *mut stack_st_ASN1_OBJECT,
+ id: *mut c_void,
+ }
+ } else if #[cfg(libressl)] {
+ #[repr(C)]
+ pub struct X509_VERIFY_PARAM {
+ pub name: *mut c_char,
+ pub check_time: time_t,
+ pub inh_flags: c_ulong,
+ pub flags: c_ulong,
+ pub purpose: c_int,
+ pub trust: c_int,
+ pub depth: c_int,
+ pub policies: *mut stack_st_ASN1_OBJECT,
+ //pub id: *mut X509_VERIFY_PARAM_ID,
+ }
+ } else if #[cfg(ossl102)] {
+ #[repr(C)]
+ pub struct X509_VERIFY_PARAM {
+ pub name: *mut c_char,
+ pub check_time: time_t,
+ pub inh_flags: c_ulong,
+ pub flags: c_ulong,
+ pub purpose: c_int,
+ pub trust: c_int,
+ pub depth: c_int,
+ pub policies: *mut stack_st_ASN1_OBJECT,
+ pub id: *mut X509_VERIFY_PARAM_ID,
+ }
+ }
+}
+
+#[repr(C)]
+pub struct X509V3_CTX {
+ flags: c_int,
+ issuer_cert: *mut c_void,
+ subject_cert: *mut c_void,
+ subject_req: *mut c_void,
+ crl: *mut c_void,
+ db_meth: *mut c_void,
+ db: *mut c_void,
+ // I like the last comment line, it is copied from OpenSSL sources:
+ // Maybe more here
+}
+pub enum CONF {}
+#[cfg(ossl110)]
+pub enum OPENSSL_INIT_SETTINGS {}
+
+pub enum ENGINE {}
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ pub enum SSL {}
+ } else if #[cfg(libressl251)] {
+ #[repr(C)]
+ pub struct SSL {
+ version: c_int,
+ method: *const ::SSL_METHOD,
+ rbio: *mut ::BIO,
+ wbio: *mut ::BIO,
+ bbio: *mut ::BIO,
+ pub server: c_int,
+ s3: *mut c_void,
+ d1: *mut c_void,
+ param: *mut c_void,
+ cipher_list: *mut stack_st_SSL_CIPHER,
+ cert: *mut c_void,
+ sid_ctx_length: c_uint,
+ sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize],
+ session: *mut ::SSL_SESSION,
+ verify_mode: c_int,
+ error: c_int,
+ error_code: c_int,
+ ctx: *mut ::SSL_CTX,
+ verify_result: c_long,
+ references: c_int,
+ client_version: c_int,
+ max_send_fragment: c_uint,
+ tlsext_hostname: *mut c_char,
+ tlsext_status_type: c_int,
+ initial_ctx: *mut ::SSL_CTX,
+ enc_read_ctx: *mut ::EVP_CIPHER_CTX,
+ read_hash: *mut EVP_MD_CTX,
+ internal: *mut c_void,
+ }
+ } else if #[cfg(libressl)] {
+ #[repr(C)]
+ pub struct SSL {
+ version: c_int,
+ type_: c_int,
+ method: *const ::SSL_METHOD,
+ rbio: *mut c_void,
+ wbio: *mut c_void,
+ bbio: *mut c_void,
+ rwstate: c_int,
+ in_handshake: c_int,
+ handshake_func: Option<unsafe extern "C" fn(*mut SSL) -> c_int>,
+ pub server: c_int,
+ new_session: c_int,
+ quiet_shutdown: c_int,
+ shutdown: c_int,
+ state: c_int,
+ rstate: c_int,
+ init_buf: *mut c_void,
+ init_msg: *mut c_void,
+ init_num: c_int,
+ init_off: c_int,
+ packet: *mut c_uchar,
+ packet_length: c_uint,
+ s3: *mut c_void,
+ d1: *mut c_void,
+ read_ahead: c_int,
+ msg_callback: Option<
+ unsafe extern "C" fn(c_int,
+ c_int,
+ c_int,
+ *const c_void,
+ size_t,
+ *mut SSL,
+ *mut c_void),
+ >,
+ msg_callback_arg: *mut c_void,
+ hit: c_int,
+ param: *mut c_void,
+ cipher_list: *mut stack_st_SSL_CIPHER,
+ cipher_list_by_id: *mut stack_st_SSL_CIPHER,
+ mac_flags: c_int,
+ aead_read_ctx: *mut c_void,
+ enc_read_ctx: *mut ::EVP_CIPHER_CTX,
+ read_hash: *mut ::EVP_MD_CTX,
+ aead_write_ctx: *mut c_void,
+ enc_write_ctx: *mut ::EVP_CIPHER_CTX,
+ write_hash: *mut ::EVP_MD_CTX,
+ cert: *mut c_void,
+ sid_ctx_length: c_uint,
+ sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize],
+ session: *mut ::SSL_SESSION,
+ generate_session_id: ::GEN_SESSION_CB,
+ verify_mode: c_int,
+ verify_callback: Option<unsafe extern "C" fn(c_int, *mut ::X509_STORE_CTX) -> c_int>,
+ info_callback: Option<unsafe extern "C" fn(*mut SSL, c_int, c_int)>,
+ error: c_int,
+ error_code: c_int,
+ ctx: *mut ::SSL_CTX,
+ debug: c_int,
+ verify_result: c_long,
+ ex_data: ::CRYPTO_EX_DATA,
+ client_CA: *mut stack_st_X509_NAME,
+ references: c_int,
+ options: c_ulong,
+ mode: c_ulong,
+ max_cert_list: c_long,
+ first_packet: c_int,
+ client_version: c_int,
+ max_send_fragment: c_uint,
+ tlsext_debug_cb:
+ Option<unsafe extern "C" fn(*mut SSL, c_int, c_int, *mut c_uchar, c_int, *mut c_void)>,
+ tlsext_debug_arg: *mut c_void,
+ tlsext_hostname: *mut c_char,
+ servername_done: c_int,
+ tlsext_status_type: c_int,
+ tlsext_status_expected: c_int,
+ tlsext_ocsp_ids: *mut c_void,
+ tlsext_ocsp_exts: *mut c_void,
+ tlsext_ocsp_resp: *mut c_uchar,
+ tlsext_ocsp_resplen: c_int,
+ tlsext_ticket_expected: c_int,
+ tlsext_ecpointformatlist_length: size_t,
+ tlsext_ecpointformatlist: *mut c_uchar,
+ tlsext_ellipticcurvelist_length: size_t,
+ tlsext_ellipticcurvelist: *mut c_uchar,
+ tlsext_session_ticket: *mut c_void,
+ tlsext_session_ticket_ext_cb: ::tls_session_ticket_ext_cb_fn,
+ tls_session_ticket_ext_cb_arg: *mut c_void,
+ tls_session_secret_cb: ::tls_session_secret_cb_fn,
+ tls_session_secret_cb_arg: *mut c_void,
+ initial_ctx: *mut ::SSL_CTX,
+ next_proto_negotiated: *mut c_uchar,
+ next_proto_negotiated_len: c_uchar,
+ srtp_profiles: *mut c_void,
+ srtp_profile: *mut c_void,
+ tlsext_heartbeat: c_uint,
+ tlsext_hb_pending: c_uint,
+ tlsext_hb_seq: c_uint,
+ alpn_client_proto_list: *mut c_uchar,
+ alpn_client_proto_list_len: c_uint,
+ renegotiate: c_int,
+ }
+ } else {
+ #[repr(C)]
+ pub struct SSL {
+ version: c_int,
+ type_: c_int,
+ method: *const ::SSL_METHOD,
+ rbio: *mut c_void,
+ wbio: *mut c_void,
+ bbio: *mut c_void,
+ rwstate: c_int,
+ in_handshake: c_int,
+ handshake_func: Option<unsafe extern "C" fn(*mut SSL) -> c_int>,
+ pub server: c_int,
+ new_session: c_int,
+ quiet_session: c_int,
+ shutdown: c_int,
+ state: c_int,
+ rstate: c_int,
+ init_buf: *mut c_void,
+ init_msg: *mut c_void,
+ init_num: c_int,
+ init_off: c_int,
+ packet: *mut c_uchar,
+ packet_length: c_uint,
+ s2: *mut c_void,
+ s3: *mut c_void,
+ d1: *mut c_void,
+ read_ahead: c_int,
+ msg_callback: Option<
+ unsafe extern "C" fn(c_int, c_int, c_int, *const c_void, size_t, *mut SSL, *mut c_void),
+ >,
+ msg_callback_arg: *mut c_void,
+ hit: c_int,
+ param: *mut c_void,
+ cipher_list: *mut stack_st_SSL_CIPHER,
+ cipher_list_by_id: *mut stack_st_SSL_CIPHER,
+ mac_flags: c_int,
+ enc_read_ctx: *mut ::EVP_CIPHER_CTX,
+ read_hash: *mut ::EVP_MD_CTX,
+ expand: *mut c_void,
+ enc_write_ctx: *mut ::EVP_CIPHER_CTX,
+ write_hash: *mut ::EVP_MD_CTX,
+ compress: *mut c_void,
+ cert: *mut c_void,
+ sid_ctx_length: c_uint,
+ sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize],
+ session: *mut ::SSL_SESSION,
+ generate_session_id: ::GEN_SESSION_CB,
+ verify_mode: c_int,
+ verify_callback: Option<unsafe extern "C" fn(c_int, *mut ::X509_STORE_CTX) -> c_int>,
+ info_callback: Option<unsafe extern "C" fn(*mut SSL, c_int, c_int)>,
+ error: c_int,
+ error_code: c_int,
+ #[cfg(not(osslconf = "OPENSSL_NO_KRB5"))]
+ kssl_ctx: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_PSK"))]
+ psk_client_callback: Option<
+ unsafe extern "C" fn(*mut SSL, *const c_char, *mut c_char, c_uint, *mut c_uchar, c_uint)
+ -> c_uint,
+ >,
+ #[cfg(not(osslconf = "OPENSSL_NO_PSK"))]
+ psk_server_callback:
+ Option<unsafe extern "C" fn(*mut SSL, *const c_char, *mut c_uchar, c_uint) -> c_uint>,
+ ctx: *mut ::SSL_CTX,
+ debug: c_int,
+ verify_result: c_long,
+ ex_data: ::CRYPTO_EX_DATA,
+ client_CA: *mut stack_st_X509_NAME,
+ references: c_int,
+ options: c_ulong,
+ mode: c_ulong,
+ max_cert_list: c_long,
+ first_packet: c_int,
+ client_version: c_int,
+ max_send_fragment: c_uint,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_debug_cb:
+ Option<unsafe extern "C" fn(*mut SSL, c_int, c_int, *mut c_uchar, c_int, *mut c_void)>,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_debug_arg: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_hostname: *mut c_char,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ servername_done: c_int,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_status_type: c_int,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_status_expected: c_int,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_ocsp_ids: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_ocsp_exts: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_ocsp_resp: *mut c_uchar,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_ocsp_resplen: c_int,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_ticket_expected: c_int,
+ #[cfg(all(
+ not(osslconf = "OPENSSL_NO_TLSEXT"),
+ not(osslconf = "OPENSSL_NO_EC")
+ ))]
+ tlsext_ecpointformatlist_length: size_t,
+ #[cfg(all(
+ not(osslconf = "OPENSSL_NO_TLSEXT"),
+ not(osslconf = "OPENSSL_NO_EC")
+ ))]
+ tlsext_ecpointformatlist: *mut c_uchar,
+ #[cfg(all(
+ not(osslconf = "OPENSSL_NO_TLSEXT"),
+ not(osslconf = "OPENSSL_NO_EC")
+ ))]
+ tlsext_ellipticcurvelist_length: size_t,
+ #[cfg(all(
+ not(osslconf = "OPENSSL_NO_TLSEXT"),
+ not(osslconf = "OPENSSL_NO_EC")
+ ))]
+ tlsext_ellipticcurvelist: *mut c_uchar,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_opaque_prf_input: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_opaque_prf_input_len: size_t,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_session_ticket: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_session_ticket_ext_cb: ::tls_session_ticket_ext_cb_fn,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tls_session_ticket_ext_cb_arg: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tls_session_secret_cb: ::tls_session_secret_cb_fn,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tls_session_secret_cb_arg: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ initial_ctx: *mut ::SSL_CTX,
+ #[cfg(all(
+ not(osslconf = "OPENSSL_NO_TLSEXT"),
+ not(osslconf = "OPENSSL_NO_NEXTPROTONEG")
+ ))]
+ next_proto_negotiated: *mut c_uchar,
+ #[cfg(all(
+ not(osslconf = "OPENSSL_NO_TLSEXT"),
+ not(osslconf = "OPENSSL_NO_NEXTPROTONEG")
+ ))]
+ next_proto_negotiated_len: c_uchar,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ srtp_profiles: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ srtp_profile: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_heartbeat: c_uint,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_hb_pending: c_uint,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_hb_seq: c_uint,
+ renegotiate: c_int,
+ #[cfg(not(osslconf = "OPENSSL_NO_SRP"))]
+ srp_ctx: ::SRP_CTX,
+ #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))]
+ alpn_client_proto_list: *mut c_uchar,
+ #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))]
+ alpn_client_proto_list_len: c_uint,
+ }
+ }
+}
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ pub enum SSL_CTX {}
+ } else if #[cfg(libressl251)] {
+ #[repr(C)]
+ pub struct SSL_CTX {
+ method: *const ::SSL_METHOD,
+ cipher_list: *mut stack_st_SSL_CIPHER,
+ cert_store: *mut c_void,
+ session_timeout: c_long,
+ pub references: c_int,
+ extra_certs: *mut stack_st_X509,
+ verify_mode: c_int,
+ sid_ctx_length: c_uint,
+ sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize],
+ param: *mut ::X509_VERIFY_PARAM,
+ default_passwd_callback: *mut c_void,
+ default_passwd_callback_userdata: *mut c_void,
+ internal: *mut c_void,
+ }
+ } else if #[cfg(libressl)] {
+ #[repr(C)]
+ pub struct SSL_CTX {
+ method: *mut c_void,
+ cipher_list: *mut c_void,
+ cipher_list_by_id: *mut c_void,
+ cert_store: *mut c_void,
+ sessions: *mut c_void,
+ session_cache_size: c_ulong,
+ session_cache_head: *mut c_void,
+ session_cache_tail: *mut c_void,
+ session_cache_mode: c_int,
+ session_timeout: c_long,
+ new_session_cb: *mut c_void,
+ remove_session_cb: *mut c_void,
+ get_session_cb: *mut c_void,
+ stats: [c_int; 11],
+ pub references: c_int,
+ app_verify_callback: *mut c_void,
+ app_verify_arg: *mut c_void,
+ default_passwd_callback: *mut c_void,
+ default_passwd_callback_userdata: *mut c_void,
+ client_cert_cb: *mut c_void,
+ app_gen_cookie_cb: *mut c_void,
+ app_verify_cookie_cb: *mut c_void,
+ ex_dat: ::CRYPTO_EX_DATA,
+ rsa_md5: *mut c_void,
+ md5: *mut c_void,
+ sha1: *mut c_void,
+ extra_certs: *mut c_void,
+ comp_methods: *mut c_void,
+ info_callback: *mut c_void,
+ client_CA: *mut c_void,
+ options: c_ulong,
+ mode: c_ulong,
+ max_cert_list: c_long,
+ cert: *mut c_void,
+ read_ahead: c_int,
+ msg_callback: *mut c_void,
+ msg_callback_arg: *mut c_void,
+ verify_mode: c_int,
+ sid_ctx_length: c_uint,
+ sid_ctx: [c_uchar; 32],
+ default_verify_callback: *mut c_void,
+ generate_session_id: *mut c_void,
+ param: *mut c_void,
+ quiet_shutdown: c_int,
+ max_send_fragment: c_uint,
+
+ #[cfg(not(osslconf = "OPENSSL_NO_ENGINE"))]
+ client_cert_engine: *mut c_void,
+
+ tlsext_servername_callback: *mut c_void,
+ tlsect_servername_arg: *mut c_void,
+ tlsext_tick_key_name: [c_uchar; 16],
+ tlsext_tick_hmac_key: [c_uchar; 16],
+ tlsext_tick_aes_key: [c_uchar; 16],
+ tlsext_ticket_key_cb: *mut c_void,
+ tlsext_status_cb: *mut c_void,
+ tlsext_status_arg: *mut c_void,
+ tlsext_opaque_prf_input_callback: *mut c_void,
+ tlsext_opaque_prf_input_callback_arg: *mut c_void,
+
+ next_protos_advertised_cb: *mut c_void,
+ next_protos_advertised_cb_arg: *mut c_void,
+ next_proto_select_cb: *mut c_void,
+ next_proto_select_cb_arg: *mut c_void,
+
+ srtp_profiles: *mut c_void,
+ }
+ } else {
+ #[repr(C)]
+ pub struct SSL_CTX {
+ method: *mut c_void,
+ cipher_list: *mut c_void,
+ cipher_list_by_id: *mut c_void,
+ cert_store: *mut c_void,
+ sessions: *mut c_void,
+ session_cache_size: c_ulong,
+ session_cache_head: *mut c_void,
+ session_cache_tail: *mut c_void,
+ session_cache_mode: c_int,
+ session_timeout: c_long,
+ new_session_cb: *mut c_void,
+ remove_session_cb: *mut c_void,
+ get_session_cb: *mut c_void,
+ stats: [c_int; 11],
+ pub references: c_int,
+ app_verify_callback: *mut c_void,
+ app_verify_arg: *mut c_void,
+ default_passwd_callback: *mut c_void,
+ default_passwd_callback_userdata: *mut c_void,
+ client_cert_cb: *mut c_void,
+ app_gen_cookie_cb: *mut c_void,
+ app_verify_cookie_cb: *mut c_void,
+ ex_dat: ::CRYPTO_EX_DATA,
+ rsa_md5: *mut c_void,
+ md5: *mut c_void,
+ sha1: *mut c_void,
+ extra_certs: *mut c_void,
+ comp_methods: *mut c_void,
+ info_callback: *mut c_void,
+ client_CA: *mut c_void,
+ options: c_ulong,
+ mode: c_ulong,
+ max_cert_list: c_long,
+ cert: *mut c_void,
+ read_ahead: c_int,
+ msg_callback: *mut c_void,
+ msg_callback_arg: *mut c_void,
+ verify_mode: c_int,
+ sid_ctx_length: c_uint,
+ sid_ctx: [c_uchar; 32],
+ default_verify_callback: *mut c_void,
+ generate_session_id: *mut c_void,
+ param: *mut c_void,
+ quiet_shutdown: c_int,
+ max_send_fragment: c_uint,
+
+ #[cfg(not(osslconf = "OPENSSL_NO_ENGINE"))]
+ client_cert_engine: *mut c_void,
+
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_servername_callback: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsect_servername_arg: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_tick_key_name: [c_uchar; 16],
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_tick_hmac_key: [c_uchar; 16],
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_tick_aes_key: [c_uchar; 16],
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_ticket_key_cb: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_status_cb: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_status_arg: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_opaque_prf_input_callback: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))]
+ tlsext_opaque_prf_input_callback_arg: *mut c_void,
+
+ #[cfg(not(osslconf = "OPENSSL_NO_PSK"))]
+ psk_identity_hint: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_PSK"))]
+ psk_client_callback: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_PSK"))]
+ psk_server_callback: *mut c_void,
+
+ #[cfg(not(osslconf = "OPENSSL_NO_BUF_FREELISTS"))]
+ freelist_max_len: c_uint,
+ #[cfg(not(osslconf = "OPENSSL_NO_BUF_FREELISTS"))]
+ wbuf_freelist: *mut c_void,
+ #[cfg(not(osslconf = "OPENSSL_NO_BUF_FREELISTS"))]
+ rbuf_freelist: *mut c_void,
+
+ #[cfg(not(osslconf = "OPENSSL_NO_SRP"))]
+ srp_ctx: SRP_CTX,
+
+ #[cfg(all(
+ not(osslconf = "OPENSSL_NO_TLSEXT"),
+ not(osslconf = "OPENSSL_NO_NEXTPROTONEG")
+ ))]
+ next_protos_advertised_cb: *mut c_void,
+ #[cfg(all(
+ not(osslconf = "OPENSSL_NO_TLSEXT"),
+ not(osslconf = "OPENSSL_NO_NEXTPROTONEG")
+ ))]
+ next_protos_advertised_cb_arg: *mut c_void,
+ #[cfg(all(
+ not(osslconf = "OPENSSL_NO_TLSEXT"),
+ not(osslconf = "OPENSSL_NO_NEXTPROTONEG")
+ ))]
+ next_proto_select_cb: *mut c_void,
+ #[cfg(all(
+ not(osslconf = "OPENSSL_NO_TLSEXT"),
+ not(osslconf = "OPENSSL_NO_NEXTPROTONEG")
+ ))]
+ next_proto_select_cb_arg: *mut c_void,
+
+ #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl101))]
+ srtp_profiles: *mut c_void,
+ #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))]
+ alpn_select_cb: *mut c_void,
+ #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))]
+ alpn_select_cb_arg: *mut c_void,
+ #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))]
+ alpn_client_proto_list: *mut c_void,
+ #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))]
+ alpn_client_proto_list_len: c_uint,
+
+ #[cfg(all(
+ not(osslconf = "OPENSSL_NO_TLSEXT"),
+ not(osslconf = "OPENSSL_NO_EC"),
+ ossl102
+ ))]
+ tlsext_ecpointformatlist_length: size_t,
+ #[cfg(all(
+ not(osslconf = "OPENSSL_NO_TLSEXT"),
+ not(osslconf = "OPENSSL_NO_EC"),
+ ossl102
+ ))]
+ tlsext_ecpointformatlist: *mut c_uchar,
+ #[cfg(all(
+ not(osslconf = "OPENSSL_NO_TLSEXT"),
+ not(osslconf = "OPENSSL_NO_EC"),
+ ossl102
+ ))]
+ tlsext_ellipticcurvelist_length: size_t,
+ #[cfg(all(
+ not(osslconf = "OPENSSL_NO_TLSEXT"),
+ not(osslconf = "OPENSSL_NO_EC"),
+ ossl102
+ ))]
+ tlsext_ellipticcurvelist: *mut c_uchar,
+ }
+
+ #[repr(C)]
+ pub struct SRP_CTX {
+ SRP_cb_arg: *mut c_void,
+ TLS_ext_srp_username_callback: *mut c_void,
+ SRP_verify_param_callback: *mut c_void,
+ SRP_give_srp_client_pwd_callback: *mut c_void,
+ login: *mut c_void,
+ N: *mut c_void,
+ g: *mut c_void,
+ s: *mut c_void,
+ B: *mut c_void,
+ A: *mut c_void,
+ a: *mut c_void,
+ b: *mut c_void,
+ v: *mut c_void,
+ info: *mut c_void,
+ stringth: c_int,
+ srp_Mask: c_ulong,
+ }
+ }
+}
+
+pub enum COMP_METHOD {}
+
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ pub enum CRYPTO_EX_DATA {}
+ } else if #[cfg(libressl)] {
+ #[repr(C)]
+ pub struct CRYPTO_EX_DATA {
+ pub sk: *mut ::stack_st_void,
+ }
+ } else {
+ #[repr(C)]
+ pub struct CRYPTO_EX_DATA {
+ pub sk: *mut stack_st_void,
+ pub dummy: c_int,
+ }
+ }
+}
+
+pub enum OCSP_RESPONSE {}

140
lang/rust/files/patch-src_vendor_openssl-sys_src_pem.rs Normal file
View file

@ -0,0 +1,140 @@
--- src/vendor/openssl-sys/src/pem.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/pem.rs
@@ -0,0 +1,137 @@
+use libc::*;
+
+use *;
+
+pub type pem_password_cb =
+ Option<unsafe extern "C" fn(buf: *mut c_char, size: c_int, rwflag: c_int, user_data: *mut c_void)
+ -> c_int>;
+
+extern "C" {
+ pub fn PEM_read_bio_X509(
+ bio: *mut BIO,
+ out: *mut *mut X509,
+ callback: pem_password_cb,
+ user_data: *mut c_void,
+ ) -> *mut X509;
+ pub fn PEM_write_bio_X509(bio: *mut BIO, x509: *mut X509) -> c_int;
+ pub fn PEM_read_bio_X509_REQ(
+ bio: *mut BIO,
+ out: *mut *mut X509_REQ,
+ callback: pem_password_cb,
+ user_data: *mut c_void,
+ ) -> *mut X509_REQ;
+ pub fn PEM_write_bio_X509_REQ(bio: *mut BIO, x509: *mut X509_REQ) -> c_int;
+ pub fn PEM_read_bio_RSAPrivateKey(
+ bio: *mut BIO,
+ rsa: *mut *mut RSA,
+ callback: pem_password_cb,
+ user_data: *mut c_void,
+ ) -> *mut RSA;
+ pub fn PEM_write_bio_RSAPrivateKey(
+ bp: *mut BIO,
+ rsa: *mut RSA,
+ cipher: *const EVP_CIPHER,
+ kstr: *mut c_uchar,
+ klen: c_int,
+ callback: pem_password_cb,
+ user_data: *mut c_void,
+ ) -> c_int;
+ pub fn PEM_read_bio_RSAPublicKey(
+ bio: *mut BIO,
+ rsa: *mut *mut RSA,
+ callback: pem_password_cb,
+ user_data: *mut c_void,
+ ) -> *mut RSA;
+ pub fn PEM_write_bio_RSAPublicKey(bp: *mut BIO, rsa: *const RSA) -> c_int;
+ pub fn PEM_read_bio_RSA_PUBKEY(
+ bio: *mut BIO,
+ rsa: *mut *mut RSA,
+ callback: pem_password_cb,
+ user_data: *mut c_void,
+ ) -> *mut RSA;
+ pub fn PEM_write_bio_RSA_PUBKEY(bp: *mut BIO, rsa: *mut RSA) -> c_int;
+ pub fn PEM_read_bio_DSAPrivateKey(
+ bp: *mut BIO,
+ dsa: *mut *mut DSA,
+ callback: pem_password_cb,
+ user_data: *mut c_void,
+ ) -> *mut DSA;
+ pub fn PEM_write_bio_DSAPrivateKey(
+ bp: *mut BIO,
+ dsa: *mut DSA,
+ cipher: *const EVP_CIPHER,
+ kstr: *mut c_uchar,
+ klen: c_int,
+ callback: pem_password_cb,
+ user_data: *mut c_void,
+ ) -> c_int;
+ pub fn PEM_read_bio_DSA_PUBKEY(
+ bp: *mut BIO,
+ dsa: *mut *mut DSA,
+ callback: pem_password_cb,
+ user_data: *mut c_void,
+ ) -> *mut DSA;
+ pub fn PEM_write_bio_DSA_PUBKEY(bp: *mut BIO, dsa: *mut DSA) -> c_int;
+ pub fn PEM_read_bio_ECPrivateKey(
+ bio: *mut BIO,
+ key: *mut *mut EC_KEY,
+ callback: pem_password_cb,
+ user_data: *mut c_void,
+ ) -> *mut EC_KEY;
+ pub fn PEM_write_bio_ECPrivateKey(
+ bio: *mut BIO,
+ key: *mut EC_KEY,
+ cipher: *const EVP_CIPHER,
+ kstr: *mut c_uchar,
+ klen: c_int,
+ callback: pem_password_cb,
+ user_data: *mut c_void,
+ ) -> c_int;
+ pub fn PEM_read_bio_DHparams(
+ bio: *mut BIO,
+ out: *mut *mut DH,
+ callback: pem_password_cb,
+ user_data: *mut c_void,
+ ) -> *mut DH;
+ pub fn PEM_write_bio_DHparams(bio: *mut BIO, x: *const DH) -> c_int;
+ pub fn PEM_read_bio_PrivateKey(
+ bio: *mut BIO,
+ out: *mut *mut EVP_PKEY,
+ callback: pem_password_cb,
+ user_data: *mut c_void,
+ ) -> *mut EVP_PKEY;
+ pub fn PEM_write_bio_PrivateKey(
+ bio: *mut BIO,
+ pkey: *mut EVP_PKEY,
+ cipher: *const EVP_CIPHER,
+ kstr: *mut c_uchar,
+ klen: c_int,
+ callback: pem_password_cb,
+ user_data: *mut c_void,
+ ) -> c_int;
+ pub fn PEM_read_bio_PUBKEY(
+ bio: *mut BIO,
+ out: *mut *mut EVP_PKEY,
+ callback: pem_password_cb,
+ user_data: *mut c_void,
+ ) -> *mut EVP_PKEY;
+ pub fn PEM_write_bio_PUBKEY(bp: *mut BIO, x: *mut EVP_PKEY) -> c_int;
+
+ pub fn PEM_write_bio_PKCS8PrivateKey(
+ bio: *mut BIO,
+ pkey: *mut EVP_PKEY,
+ cipher: *const EVP_CIPHER,
+ kstr: *mut c_char,
+ klen: c_int,
+ callback: pem_password_cb,
+ user_data: *mut c_void,
+ ) -> c_int;
+ pub fn d2i_PKCS8PrivateKey_bio(
+ bp: *mut BIO,
+ x: *mut *mut EVP_PKEY,
+ cb: pem_password_cb,
+ u: *mut c_void,
+ ) -> *mut EVP_PKEY;
+}
+
+pub const PEM_R_NO_START_LINE: c_int = 108;

59
lang/rust/files/patch-src_vendor_openssl-sys_src_pkcs12.rs Normal file
View file

@ -0,0 +1,59 @@
--- src/vendor/openssl-sys/src/pkcs12.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/pkcs12.rs
@@ -0,0 +1,56 @@
+use libc::*;
+
+use *;
+
+pub enum PKCS12 {}
+
+extern "C" {
+ pub fn PKCS12_free(p12: *mut PKCS12);
+ pub fn i2d_PKCS12(a: *mut PKCS12, buf: *mut *mut u8) -> c_int;
+ pub fn d2i_PKCS12(a: *mut *mut PKCS12, pp: *mut *const u8, length: c_long) -> *mut PKCS12;
+
+ pub fn PKCS12_parse(
+ p12: *mut PKCS12,
+ pass: *const c_char,
+ pkey: *mut *mut EVP_PKEY,
+ cert: *mut *mut X509,
+ ca: *mut *mut stack_st_X509,
+ ) -> c_int;
+}
+cfg_if! {
+ if #[cfg(any(ossl110, libressl280))] {
+ extern "C" {
+ pub fn PKCS12_create(
+ pass: *const c_char,
+ friendly_name: *const c_char,
+ pkey: *mut EVP_PKEY,
+ cert: *mut X509,
+ ca: *mut stack_st_X509,
+ nid_key: c_int,
+ nid_cert: c_int,
+ iter: c_int,
+ mac_iter: c_int,
+ keytype: c_int,
+ ) -> *mut PKCS12;
+ }
+ } else {
+ extern "C" {
+ pub fn PKCS12_create(
+ pass: *mut c_char,
+ friendly_name: *mut c_char,
+ pkey: *mut EVP_PKEY,
+ cert: *mut X509,
+ ca: *mut stack_st_X509,
+ nid_key: c_int,
+ nid_cert: c_int,
+ iter: c_int,
+ mac_iter: c_int,
+ keytype: c_int,
+ ) -> *mut PKCS12;
+ }
+ }
+}
+
+extern "C" {
+ pub fn i2d_PKCS12_bio(b: *mut BIO, a: *mut PKCS12) -> c_int;
+}

9
lang/rust/files/patch-src_vendor_openssl-sys_src_rand.rs Normal file
View file

@ -0,0 +1,9 @@
--- src/vendor/openssl-sys/src/rand.rs.orig 2018-09-16 20:29:19 UTC
+++ src/vendor/openssl-sys/src/rand.rs
@@ -0,0 +1,6 @@
+use libc::*;
+
+extern "C" {
+ pub fn RAND_bytes(buf: *mut u8, num: c_int) -> c_int;
+ pub fn RAND_status() -> c_int;
+}

Some files were not shown because too many files have changed in this diff Show more