Replace AndroidPinning submodule by checked in code
This commit is contained in:
parent
be2cb0cc43
commit
89673dfd2d
4
.gitmodules
vendored
4
.gitmodules
vendored
@ -6,10 +6,6 @@
|
|||||||
path = extern/MemorizingTrustManager
|
path = extern/MemorizingTrustManager
|
||||||
url = https://github.com/ge0rg/MemorizingTrustManager.git
|
url = https://github.com/ge0rg/MemorizingTrustManager.git
|
||||||
ignore = dirty
|
ignore = dirty
|
||||||
[submodule "extern/AndroidPinning"]
|
|
||||||
path = extern/AndroidPinning
|
|
||||||
url = https://gitlab.com/fdroid/androidpinning.git
|
|
||||||
ignore = dirty
|
|
||||||
[submodule "extern/libsuperuser"]
|
[submodule "extern/libsuperuser"]
|
||||||
path = extern/libsuperuser
|
path = extern/libsuperuser
|
||||||
url = https://github.com/Chainfire/libsuperuser
|
url = https://github.com/Chainfire/libsuperuser
|
||||||
|
1
extern/AndroidPinning
vendored
1
extern/AndroidPinning
vendored
@ -1 +0,0 @@
|
|||||||
Subproject commit d8c0143e18ab3abb693300fe4dfbcd05907f7536
|
|
9
extern/AndroidPinning/AndroidManifest.xml
vendored
Normal file
9
extern/AndroidPinning/AndroidManifest.xml
vendored
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="org.thoughtcrime.ssl.pinning"
|
||||||
|
android:versionCode="1"
|
||||||
|
android:versionName="1.0.0">
|
||||||
|
|
||||||
|
<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="17"/>
|
||||||
|
|
||||||
|
</manifest>
|
621
extern/AndroidPinning/LICENSE
vendored
Normal file
621
extern/AndroidPinning/LICENSE
vendored
Normal file
@ -0,0 +1,621 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
30
extern/AndroidPinning/build.gradle
vendored
Normal file
30
extern/AndroidPinning/build.gradle
vendored
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
buildscript {
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
classpath 'com.android.tools.build:gradle:1.0.0'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
apply plugin: 'android-library'
|
||||||
|
|
||||||
|
android {
|
||||||
|
compileSdkVersion 17
|
||||||
|
buildToolsVersion '17.0.0'
|
||||||
|
|
||||||
|
android {
|
||||||
|
sourceSets {
|
||||||
|
main {
|
||||||
|
manifest.srcFile 'AndroidManifest.xml'
|
||||||
|
java.srcDirs = ['src']
|
||||||
|
resources.srcDirs = ['src']
|
||||||
|
aidl.srcDirs = ['src']
|
||||||
|
renderscript.srcDirs = ['src']
|
||||||
|
res.srcDirs = ['res']
|
||||||
|
assets.srcDirs = ['assets']
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
2
extern/AndroidPinning/project.properties
vendored
Normal file
2
extern/AndroidPinning/project.properties
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
target=android-17
|
||||||
|
android.library=true
|
BIN
extern/AndroidPinning/res/raw/cacerts
vendored
Normal file
BIN
extern/AndroidPinning/res/raw/cacerts
vendored
Normal file
Binary file not shown.
89
extern/AndroidPinning/src/org/thoughtcrime/ssl/pinning/CertificateChainCleaner.java
vendored
Normal file
89
extern/AndroidPinning/src/org/thoughtcrime/ssl/pinning/CertificateChainCleaner.java
vendored
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (C) 2011-2013 Moxie Marlinspike
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.thoughtcrime.ssl.pinning;
|
||||||
|
|
||||||
|
import java.security.GeneralSecurityException;
|
||||||
|
import java.security.cert.CertificateException;
|
||||||
|
import java.security.cert.X509Certificate;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Does the work of cleaning up a certificate chain by sifting out any
|
||||||
|
* unrelated certificates and returning something that's signed from
|
||||||
|
* EE to a trust anchor.
|
||||||
|
*
|
||||||
|
* @author Moxie Marlinspike
|
||||||
|
*/
|
||||||
|
class CertificateChainCleaner {
|
||||||
|
|
||||||
|
private CertificateChainCleaner() {}
|
||||||
|
|
||||||
|
public static X509Certificate[] getCleanChain(X509Certificate[] chain,
|
||||||
|
SystemKeyStore systemKeyStore)
|
||||||
|
throws CertificateException
|
||||||
|
{
|
||||||
|
final LinkedList<X509Certificate> cleanChain = new LinkedList<X509Certificate>();
|
||||||
|
boolean trustedChain = false;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
if (systemKeyStore.isTrustRoot(chain[0])) {
|
||||||
|
trustedChain = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanChain.add(chain[0]);
|
||||||
|
|
||||||
|
for (i = 1; i < chain.length; i++) {
|
||||||
|
if (systemKeyStore.isTrustRoot(chain[i])) {
|
||||||
|
trustedChain = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isValidLink(chain[i], chain[i - 1])) {
|
||||||
|
cleanChain.add(chain[i]);
|
||||||
|
} else {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final X509Certificate trustRoot = systemKeyStore.getTrustRootFor(chain[i - 1]);
|
||||||
|
|
||||||
|
if (trustRoot != null) {
|
||||||
|
cleanChain.add(trustRoot);
|
||||||
|
trustedChain = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (trustedChain) {
|
||||||
|
return cleanChain.toArray(new X509Certificate[cleanChain.size()]);
|
||||||
|
} else {
|
||||||
|
throw new CertificateException("Didn't find a trust anchor in chain cleanup!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isValidLink(X509Certificate parent, X509Certificate child) {
|
||||||
|
if (!parent.getSubjectX500Principal().equals(child.getIssuerX500Principal())) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
child.verify(parent.getPublicKey());
|
||||||
|
} catch (GeneralSecurityException gse) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
166
extern/AndroidPinning/src/org/thoughtcrime/ssl/pinning/PinningSSLSocketFactory.java
vendored
Normal file
166
extern/AndroidPinning/src/org/thoughtcrime/ssl/pinning/PinningSSLSocketFactory.java
vendored
Normal file
@ -0,0 +1,166 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (C) 2011-2013 Moxie Marlinspike
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.thoughtcrime.ssl.pinning;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import org.apache.http.conn.ssl.SSLSocketFactory;
|
||||||
|
import org.apache.http.conn.ssl.X509HostnameVerifier;
|
||||||
|
import org.apache.http.params.HttpConnectionParams;
|
||||||
|
import org.apache.http.params.HttpParams;
|
||||||
|
|
||||||
|
import javax.net.ssl.SSLContext;
|
||||||
|
import javax.net.ssl.SSLSocket;
|
||||||
|
import javax.net.ssl.TrustManager;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.InetAddress;
|
||||||
|
import java.net.InetSocketAddress;
|
||||||
|
import java.net.Socket;
|
||||||
|
import java.security.KeyManagementException;
|
||||||
|
import java.security.KeyStoreException;
|
||||||
|
import java.security.NoSuchAlgorithmException;
|
||||||
|
import java.security.UnrecoverableKeyException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A standard Apache SSL Socket Factory that uses an pinning trust manager.
|
||||||
|
* <p>
|
||||||
|
* To use:
|
||||||
|
* <pre>
|
||||||
|
*
|
||||||
|
* String[] pins = new String[] {"40c5401d6f8cbaf08b00edefb1ee87d005b3b9cd"};
|
||||||
|
* SchemeRegistry schemeRegistry = new SchemeRegistry();
|
||||||
|
* schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
|
||||||
|
* schemeRegistry.register(new Scheme("https", new PinningSSLSocketFactory(getContext(),pins, 0), 443));
|
||||||
|
*
|
||||||
|
* HttpParams httpParams = new BasicHttpParams();
|
||||||
|
* ClientConnectionManager connectionManager = new ThreadSafeClientConnManager(httpParams, schemeRegistry);
|
||||||
|
* DefaultHttpClient httpClient = new DefaultHttpClient(connectionManager, httpParams);
|
||||||
|
*
|
||||||
|
* HttpResponse response = httpClient.execute(new HttpGet("https://www.google.com/"));
|
||||||
|
*
|
||||||
|
* </pre>
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @author Moxie Marlinspike
|
||||||
|
*/
|
||||||
|
public class PinningSSLSocketFactory extends SSLSocketFactory {
|
||||||
|
|
||||||
|
private final javax.net.ssl.SSLSocketFactory pinningSocketFactory;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs a PinningSSLSocketFactory with a set of valid pins.
|
||||||
|
*
|
||||||
|
* @param pins An array of encoded pins to match a seen certificate
|
||||||
|
* chain against. A pin is a hex-encoded hash of a X.509 certificate's
|
||||||
|
* SubjectPublicKeyInfo. A pin can be generated using the provided pin.py
|
||||||
|
* script: python ./tools/pin.py certificate_file.pem
|
||||||
|
*
|
||||||
|
* @param enforceUntilTimestampMillis A timestamp (in milliseconds) when pins will stop being
|
||||||
|
* enforced. Normal non-pinned certificate validation
|
||||||
|
* will continue. Set this to some period after your build
|
||||||
|
* date, or to 0 to enforce pins forever.
|
||||||
|
*/
|
||||||
|
|
||||||
|
public PinningSSLSocketFactory(Context context, String[] pins, long enforceUntilTimestampMillis)
|
||||||
|
throws UnrecoverableKeyException, KeyManagementException,
|
||||||
|
NoSuchAlgorithmException, KeyStoreException
|
||||||
|
{
|
||||||
|
super(null);
|
||||||
|
|
||||||
|
final SystemKeyStore keyStore = SystemKeyStore.getInstance(context);
|
||||||
|
final SSLContext pinningSslContext = SSLContext.getInstance(TLS);
|
||||||
|
final TrustManager[] pinningTrustManagers = initializePinningTrustManagers(keyStore, pins, enforceUntilTimestampMillis);
|
||||||
|
|
||||||
|
pinningSslContext.init(null, pinningTrustManagers, null);
|
||||||
|
this.pinningSocketFactory = pinningSslContext.getSocketFactory();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Socket createSocket() throws IOException {
|
||||||
|
return pinningSocketFactory.createSocket();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Socket connectSocket(final Socket sock, final String host, final int port,
|
||||||
|
final InetAddress localAddress, int localPort,
|
||||||
|
final HttpParams params) throws IOException {
|
||||||
|
final SSLSocket sslSock = (SSLSocket) ((sock != null) ? sock : createSocket());
|
||||||
|
|
||||||
|
if ((localAddress != null) || (localPort > 0)) {
|
||||||
|
if (localPort < 0) {
|
||||||
|
localPort = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
sslSock.bind(new InetSocketAddress(localAddress, localPort));
|
||||||
|
}
|
||||||
|
|
||||||
|
final int connTimeout = HttpConnectionParams.getConnectionTimeout(params);
|
||||||
|
final int soTimeout = HttpConnectionParams.getSoTimeout(params);
|
||||||
|
|
||||||
|
final InetSocketAddress remoteAddress = new InetSocketAddress(host, port);
|
||||||
|
sslSock.connect(remoteAddress, connTimeout);
|
||||||
|
sslSock.setSoTimeout(soTimeout);
|
||||||
|
|
||||||
|
try {
|
||||||
|
SSLSocketFactory.STRICT_HOSTNAME_VERIFIER.verify(host, sslSock);
|
||||||
|
} catch (IOException iox) {
|
||||||
|
try {
|
||||||
|
sslSock.close();
|
||||||
|
} catch (Exception ignored) {
|
||||||
|
}
|
||||||
|
throw iox;
|
||||||
|
}
|
||||||
|
|
||||||
|
return sslSock;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Socket createSocket(final Socket socket, final String host,
|
||||||
|
int port, final boolean autoClose)
|
||||||
|
throws IOException
|
||||||
|
{
|
||||||
|
if (port == -1) {
|
||||||
|
port = 443;
|
||||||
|
}
|
||||||
|
|
||||||
|
final SSLSocket sslSocket = (SSLSocket) pinningSocketFactory.createSocket(socket, host, port, autoClose);
|
||||||
|
SSLSocketFactory.STRICT_HOSTNAME_VERIFIER.verify(host, sslSocket);
|
||||||
|
return sslSocket;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setHostnameVerifier(X509HostnameVerifier hostnameVerifier) {
|
||||||
|
throw new IllegalArgumentException("Only strict hostname verification (default) " +
|
||||||
|
"is supported!");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public X509HostnameVerifier getHostnameVerifier() {
|
||||||
|
return SSLSocketFactory.STRICT_HOSTNAME_VERIFIER;
|
||||||
|
}
|
||||||
|
|
||||||
|
private TrustManager[] initializePinningTrustManagers(SystemKeyStore keyStore,
|
||||||
|
String[] pins,
|
||||||
|
long enforceUntilTimestampMillis)
|
||||||
|
{
|
||||||
|
final TrustManager[] trustManagers = new TrustManager[1];
|
||||||
|
trustManagers[0] = new PinningTrustManager(keyStore, pins, enforceUntilTimestampMillis);
|
||||||
|
|
||||||
|
return trustManagers;
|
||||||
|
}
|
||||||
|
}
|
199
extern/AndroidPinning/src/org/thoughtcrime/ssl/pinning/PinningTrustManager.java
vendored
Normal file
199
extern/AndroidPinning/src/org/thoughtcrime/ssl/pinning/PinningTrustManager.java
vendored
Normal file
@ -0,0 +1,199 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (C) 2011-2013 Moxie Marlinspike
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.thoughtcrime.ssl.pinning;
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.security.KeyStoreException;
|
||||||
|
import java.security.MessageDigest;
|
||||||
|
import java.security.NoSuchAlgorithmException;
|
||||||
|
import java.security.cert.CertificateException;
|
||||||
|
import java.security.cert.X509Certificate;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
import javax.net.ssl.TrustManager;
|
||||||
|
import javax.net.ssl.TrustManagerFactory;
|
||||||
|
import javax.net.ssl.X509TrustManager;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A TrustManager implementation that enforces Certificate "pins."
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* PinningTrustManager is layered on top of the system's default TrustManager,
|
||||||
|
* such that the system continues to validate CA signatures for SSL connections
|
||||||
|
* as usual. Additionally, however, PinningTrustManager will enforce certificate
|
||||||
|
* constraints on the validated certificate chain. Specifically, it
|
||||||
|
* will ensure that one of an arbitrary number of specified SubjectPublicKeyInfos
|
||||||
|
* appears somewhere in the valid certificate chain.
|
||||||
|
* </p>
|
||||||
|
* <p>
|
||||||
|
* To use:
|
||||||
|
* <pre>
|
||||||
|
* TrustManager[] trustManagers = new TrustManager[1];
|
||||||
|
* trustManagers[0] = new PinningTrustManager(SystemKeyStore.getInstance(),
|
||||||
|
* new String[] {"f30012bbc18c231ac1a44b788e410ce754182513"},
|
||||||
|
* 0);
|
||||||
|
*
|
||||||
|
* SSLContext sslContext = SSLContext.getInstance("TLS");
|
||||||
|
* sslContext.init(null, trustManagers, null);
|
||||||
|
*
|
||||||
|
* HttpsURLConnection urlConnection = (HttpsURLConnection)new URL("https://encrypted.google.com/").openConnection();
|
||||||
|
* urlConnection.setSSLSocketFactory(sslContext.getSocketFactory());
|
||||||
|
* InputStream in = urlConnection.getInputStream();
|
||||||
|
* </pre>
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @author Moxie Marlinspike
|
||||||
|
*/
|
||||||
|
public class PinningTrustManager implements X509TrustManager {
|
||||||
|
|
||||||
|
private final TrustManager[] systemTrustManagers;
|
||||||
|
private final SystemKeyStore systemKeyStore;
|
||||||
|
private final long enforceUntilTimestampMillis;
|
||||||
|
|
||||||
|
private final List<byte[]> pins = new LinkedList<byte[]>();
|
||||||
|
private final Set<X509Certificate> cache = Collections.synchronizedSet(new HashSet<X509Certificate>());
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs a PinningTrustManager with a set of valid pins.
|
||||||
|
*
|
||||||
|
* @param keyStore A SystemKeyStore that validation will be based on.
|
||||||
|
*
|
||||||
|
* @param pins An array of encoded pins to match a seen certificate
|
||||||
|
* chain against. A pin is a hex-encoded hash of a X.509 certificate's
|
||||||
|
* SubjectPublicKeyInfo. A pin can be generated using the provided pin.py
|
||||||
|
* script: python ./tools/pin.py certificate_file.pem
|
||||||
|
*
|
||||||
|
* @param enforceUntilTimestampMillis A timestamp (in milliseconds) when pins will stop being
|
||||||
|
* enforced. Normal non-pinned certificate validation
|
||||||
|
* will continue. Set this to some period after your build
|
||||||
|
* date, or to 0 to enforce pins forever.
|
||||||
|
*/
|
||||||
|
public PinningTrustManager(SystemKeyStore keyStore, String[] pins, long enforceUntilTimestampMillis) {
|
||||||
|
this.systemTrustManagers = initializeSystemTrustManagers(keyStore);
|
||||||
|
this.systemKeyStore = keyStore;
|
||||||
|
this.enforceUntilTimestampMillis = enforceUntilTimestampMillis;
|
||||||
|
|
||||||
|
for (String pin : pins) {
|
||||||
|
this.pins.add(hexStringToByteArray(pin));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private TrustManager[] initializeSystemTrustManagers(SystemKeyStore keyStore) {
|
||||||
|
try {
|
||||||
|
final TrustManagerFactory tmf = TrustManagerFactory.getInstance("X509");
|
||||||
|
tmf.init(keyStore.trustStore);
|
||||||
|
|
||||||
|
return tmf.getTrustManagers();
|
||||||
|
} catch (NoSuchAlgorithmException nsae) {
|
||||||
|
throw new AssertionError(nsae);
|
||||||
|
} catch (KeyStoreException e) {
|
||||||
|
throw new AssertionError(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isValidPin(X509Certificate certificate) throws CertificateException {
|
||||||
|
try {
|
||||||
|
final MessageDigest digest = MessageDigest.getInstance("SHA1");
|
||||||
|
final byte[] spki = certificate.getPublicKey().getEncoded();
|
||||||
|
final byte[] pin = digest.digest(spki);
|
||||||
|
|
||||||
|
for (byte[] validPin : this.pins) {
|
||||||
|
if (Arrays.equals(validPin, pin)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
} catch (NoSuchAlgorithmException nsae) {
|
||||||
|
throw new CertificateException(nsae);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkSystemTrust(X509Certificate[] chain, String authType)
|
||||||
|
throws CertificateException {
|
||||||
|
for (TrustManager systemTrustManager : systemTrustManagers) {
|
||||||
|
((X509TrustManager) systemTrustManager).checkServerTrusted(chain, authType);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkPinTrust(X509Certificate[] chain)
|
||||||
|
throws CertificateException {
|
||||||
|
|
||||||
|
if (enforceUntilTimestampMillis != 0 &&
|
||||||
|
System.currentTimeMillis() > enforceUntilTimestampMillis)
|
||||||
|
{
|
||||||
|
Log.w("PinningTrustManager", "Certificate pins are stale, falling back to system trust.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final X509Certificate[] cleanChain = CertificateChainCleaner.getCleanChain(chain, systemKeyStore);
|
||||||
|
|
||||||
|
for (X509Certificate certificate : cleanChain) {
|
||||||
|
if (isValidPin(certificate)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new CertificateException("No valid pins found in chain!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void checkClientTrusted(X509Certificate[] chain, String authType)
|
||||||
|
throws CertificateException {
|
||||||
|
throw new CertificateException("Client certificates not supported!");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void checkServerTrusted(X509Certificate[] chain, String authType)
|
||||||
|
throws CertificateException
|
||||||
|
{
|
||||||
|
if (cache.contains(chain[0])) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Note: We do this so that we'll never be doing worse than the default
|
||||||
|
// system validation. It's duplicate work, however, and can be factored
|
||||||
|
// out if we make the verification below more complete.
|
||||||
|
checkSystemTrust(chain, authType);
|
||||||
|
checkPinTrust(chain);
|
||||||
|
cache.add(chain[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public X509Certificate[] getAcceptedIssuers() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private byte[] hexStringToByteArray(String s) {
|
||||||
|
final int len = s.length();
|
||||||
|
final byte[] data = new byte[len / 2];
|
||||||
|
|
||||||
|
for (int i = 0; i < len; i += 2) {
|
||||||
|
data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4) +
|
||||||
|
Character.digit(s.charAt(i + 1), 16));
|
||||||
|
}
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void clearCache() {
|
||||||
|
cache.clear();
|
||||||
|
}
|
||||||
|
}
|
138
extern/AndroidPinning/src/org/thoughtcrime/ssl/pinning/SystemKeyStore.java
vendored
Normal file
138
extern/AndroidPinning/src/org/thoughtcrime/ssl/pinning/SystemKeyStore.java
vendored
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (C) 2011-2013 Moxie Marlinspike
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package org.thoughtcrime.ssl.pinning;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.res.Resources.NotFoundException;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.io.BufferedInputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.security.GeneralSecurityException;
|
||||||
|
import java.security.KeyStore;
|
||||||
|
import java.security.KeyStoreException;
|
||||||
|
import java.security.NoSuchAlgorithmException;
|
||||||
|
import java.security.Principal;
|
||||||
|
import java.security.cert.CertificateException;
|
||||||
|
import java.security.cert.X509Certificate;
|
||||||
|
import java.util.Enumeration;
|
||||||
|
import java.util.HashMap;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An interface to the system's trust anchors. We're using our
|
||||||
|
* own truststore, which is just the AOSP default, but in a place
|
||||||
|
* we know to find it for sure.
|
||||||
|
*
|
||||||
|
* @author Moxie Marlinspike
|
||||||
|
*/
|
||||||
|
public class SystemKeyStore {
|
||||||
|
private static final int CACERTS_FILE_SIZE = 1024 * 140;
|
||||||
|
|
||||||
|
private static SystemKeyStore instance;
|
||||||
|
|
||||||
|
public static synchronized SystemKeyStore getInstance(Context context) {
|
||||||
|
if (instance == null) {
|
||||||
|
instance = new SystemKeyStore(context);
|
||||||
|
}
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
private final HashMap<Principal, X509Certificate> trustRoots;
|
||||||
|
final KeyStore trustStore;
|
||||||
|
|
||||||
|
private SystemKeyStore(Context context) {
|
||||||
|
final KeyStore trustStore = getTrustStore(context);
|
||||||
|
this.trustRoots = initializeTrustedRoots(trustStore);
|
||||||
|
this.trustStore = trustStore;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isTrustRoot(X509Certificate certificate) {
|
||||||
|
final X509Certificate trustRoot = trustRoots.get(certificate.getSubjectX500Principal());
|
||||||
|
return trustRoot != null && trustRoot.getPublicKey().equals(certificate.getPublicKey());
|
||||||
|
}
|
||||||
|
|
||||||
|
public X509Certificate getTrustRootFor(X509Certificate certificate) {
|
||||||
|
final X509Certificate trustRoot = trustRoots.get(certificate.getIssuerX500Principal());
|
||||||
|
|
||||||
|
if (trustRoot == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (trustRoot.getSubjectX500Principal().equals(certificate.getSubjectX500Principal())) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
certificate.verify(trustRoot.getPublicKey());
|
||||||
|
} catch (GeneralSecurityException e) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return trustRoot;
|
||||||
|
}
|
||||||
|
|
||||||
|
private HashMap<Principal, X509Certificate> initializeTrustedRoots(KeyStore trustStore) {
|
||||||
|
try {
|
||||||
|
final HashMap<Principal, X509Certificate> trusted =
|
||||||
|
new HashMap<Principal, X509Certificate>();
|
||||||
|
|
||||||
|
for (Enumeration<String> aliases = trustStore.aliases(); aliases.hasMoreElements(); ) {
|
||||||
|
final String alias = aliases.nextElement();
|
||||||
|
final X509Certificate cert = (X509Certificate) trustStore.getCertificate(alias);
|
||||||
|
|
||||||
|
if (cert != null) {
|
||||||
|
trusted.put(cert.getSubjectX500Principal(), cert);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return trusted;
|
||||||
|
} catch (KeyStoreException e) {
|
||||||
|
throw new AssertionError(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private KeyStore getTrustStore(Context context) {
|
||||||
|
try {
|
||||||
|
final KeyStore trustStore = KeyStore.getInstance("BKS");
|
||||||
|
final BufferedInputStream bin =
|
||||||
|
new BufferedInputStream(context.getResources().openRawResource(R.raw.cacerts),
|
||||||
|
CACERTS_FILE_SIZE);
|
||||||
|
|
||||||
|
try {
|
||||||
|
trustStore.load(bin, "changeit".toCharArray());
|
||||||
|
} finally {
|
||||||
|
try {
|
||||||
|
bin.close();
|
||||||
|
} catch (IOException ioe) {
|
||||||
|
Log.w("SystemKeyStore", ioe);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return trustStore;
|
||||||
|
} catch (KeyStoreException kse) {
|
||||||
|
throw new AssertionError(kse);
|
||||||
|
} catch (NoSuchAlgorithmException e) {
|
||||||
|
throw new AssertionError(e);
|
||||||
|
} catch (CertificateException e) {
|
||||||
|
throw new AssertionError(e);
|
||||||
|
} catch (NotFoundException e) {
|
||||||
|
throw new AssertionError(e);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new AssertionError(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
111
extern/AndroidPinning/src/org/thoughtcrime/ssl/pinning/util/PinningHelper.java
vendored
Normal file
111
extern/AndroidPinning/src/org/thoughtcrime/ssl/pinning/util/PinningHelper.java
vendored
Normal file
@ -0,0 +1,111 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (C) 2011-2013 Moxie Marlinspike
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.thoughtcrime.ssl.pinning.util;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import org.apache.http.client.HttpClient;
|
||||||
|
import org.apache.http.conn.ClientConnectionManager;
|
||||||
|
import org.apache.http.conn.scheme.PlainSocketFactory;
|
||||||
|
import org.apache.http.conn.scheme.Scheme;
|
||||||
|
import org.apache.http.conn.scheme.SchemeRegistry;
|
||||||
|
import org.apache.http.impl.client.DefaultHttpClient;
|
||||||
|
import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
|
||||||
|
import org.apache.http.params.BasicHttpParams;
|
||||||
|
import org.apache.http.params.HttpParams;
|
||||||
|
import org.thoughtcrime.ssl.pinning.PinningSSLSocketFactory;
|
||||||
|
import org.thoughtcrime.ssl.pinning.PinningTrustManager;
|
||||||
|
import org.thoughtcrime.ssl.pinning.SystemKeyStore;
|
||||||
|
|
||||||
|
import javax.net.ssl.HttpsURLConnection;
|
||||||
|
import javax.net.ssl.SSLContext;
|
||||||
|
import javax.net.ssl.TrustManager;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.security.KeyManagementException;
|
||||||
|
import java.security.KeyStoreException;
|
||||||
|
import java.security.NoSuchAlgorithmException;
|
||||||
|
import java.security.UnrecoverableKeyException;
|
||||||
|
|
||||||
|
public class PinningHelper {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs an HttpClient that will validate SSL connections with a PinningTrustManager.
|
||||||
|
*
|
||||||
|
* @param pins An array of encoded pins to match a seen certificate
|
||||||
|
* chain against. A pin is a hex-encoded hash of a X.509 certificate's
|
||||||
|
* SubjectPublicKeyInfo. A pin can be generated using the provided pin.py
|
||||||
|
* script: python ./tools/pin.py certificate_file.pem
|
||||||
|
*/
|
||||||
|
|
||||||
|
public static HttpClient getPinnedHttpClient(Context context, String[] pins) {
|
||||||
|
try {
|
||||||
|
SchemeRegistry schemeRegistry = new SchemeRegistry();
|
||||||
|
schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
|
||||||
|
schemeRegistry.register(new Scheme("https", new PinningSSLSocketFactory(context, pins, 0), 443));
|
||||||
|
|
||||||
|
HttpParams httpParams = new BasicHttpParams();
|
||||||
|
ClientConnectionManager connectionManager = new ThreadSafeClientConnManager(httpParams, schemeRegistry);
|
||||||
|
return new DefaultHttpClient(connectionManager, httpParams);
|
||||||
|
} catch (UnrecoverableKeyException e) {
|
||||||
|
throw new AssertionError(e);
|
||||||
|
} catch (KeyManagementException e) {
|
||||||
|
throw new AssertionError(e);
|
||||||
|
} catch (NoSuchAlgorithmException e) {
|
||||||
|
throw new AssertionError(e);
|
||||||
|
} catch (KeyStoreException e) {
|
||||||
|
throw new AssertionError(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs an HttpsURLConnection that will validate HTTPS connections against a set of
|
||||||
|
* specified pins.
|
||||||
|
*
|
||||||
|
* @param pins An array of encoded pins to match a seen certificate
|
||||||
|
* chain against. A pin is a hex-encoded hash of a X.509 certificate's
|
||||||
|
* SubjectPublicKeyInfo. A pin can be generated using the provided pin.py
|
||||||
|
* script: python ./tools/pin.py certificate_file.pem
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
public static HttpsURLConnection getPinnedHttpsURLConnection(Context context, String[] pins, URL url)
|
||||||
|
throws IOException
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
if (!url.getProtocol().equals("https")) {
|
||||||
|
throw new IllegalArgumentException("Attempt to construct pinned non-https connection!");
|
||||||
|
}
|
||||||
|
|
||||||
|
TrustManager[] trustManagers = new TrustManager[1];
|
||||||
|
trustManagers[0] = new PinningTrustManager(SystemKeyStore.getInstance(context), pins, 0);
|
||||||
|
|
||||||
|
SSLContext sslContext = SSLContext.getInstance("TLS");
|
||||||
|
sslContext.init(null, trustManagers, null);
|
||||||
|
|
||||||
|
HttpsURLConnection urlConnection = (HttpsURLConnection)url.openConnection();
|
||||||
|
urlConnection.setSSLSocketFactory(sslContext.getSocketFactory());
|
||||||
|
|
||||||
|
return urlConnection;
|
||||||
|
} catch (NoSuchAlgorithmException nsae) {
|
||||||
|
throw new AssertionError(nsae);
|
||||||
|
} catch (KeyManagementException e) {
|
||||||
|
throw new AssertionError(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user