summaryrefslogtreecommitdiffstats
path: root/crypto
Commit message (Expand)AuthorAgeFilesLines
* Return IvParameters in OpenSSLCipher#getParametersKenny Root2013-09-111-5/+44
* Some cleanup while investigating test_SSLSocket_interruptBrian Carlstrom2013-09-101-53/+114
* Delay SSLSocketImpl instantiation until neededKenny Root2013-09-104-5/+14
* Use sk_FOO_pop_free instead of sk_FOO_freeKenny Root2013-09-101-4/+5
* Register Conscrypt as the AlgNameMapper sourceKenny Root2013-09-063-37/+58
* Make sure ChannelID key is initializedKenny Root2013-09-061-0/+2
* Merge "Register Conscrypt as the AlgNameMapper source"Kenny Root2013-09-062-0/+37
|\
| * Register Conscrypt as the AlgNameMapper sourceKenny Root2013-09-062-0/+37
* | Merge "Call SSL_use_certificate before SSL_use_PrivateKey"Brian Carlstrom2013-09-061-3/+5
|\ \ | |/ |/|
| * Call SSL_use_certificate before SSL_use_PrivateKeyBrian Carlstrom2013-08-291-3/+5
* | Move conscrypt out libjavacore and split testsKenny Root2013-08-302-28/+6
|/
* Fix BIO_OutputStream::write to return the correct length.Elliott Hughes2013-08-191-11/+27
* Move libcore to C++11.Elliott Hughes2013-08-121-3/+2
* If libcore wants ASCII casing, it needs to ask for it like everyone else.Elliott Hughes2013-08-021-2/+3
* Fix libcore's NativeCode.mk so we actually compile with -Werror.Elliott Hughes2013-07-301-4/+5
* am 4c88ce8d: Merge "NativeCrypto: Add ALPN support"Kenny Root2013-06-264-93/+307
|\
| * NativeCrypto: Add ALPN supportKenny Root2013-06-254-93/+307
* | am aa1e1d6d: Merge "NativeCrypto: handle X.509 serial number 0"Kenny Root2013-06-051-3/+2
|\ \ | |/
| * NativeCrypto: handle X.509 serial number 0Kenny Root2013-06-051-3/+2
* | am 940f8573: Merge "NativeCrypto: free error state on client_cb"Kenny Root2013-06-051-0/+5
|\ \ | |/
| * NativeCrypto: free error state on client_cbKenny Root2013-06-051-0/+5
* | am 40630ebf: Merge "NativeCrypto: check that npnProtocols != NULL"Kenny Root2013-05-291-14/+19
|\ \ | |/
| * Merge "NativeCrypto: check that npnProtocols != NULL"Kenny Root2013-05-291-14/+19
| |\
| | * NativeCrypto: check that npnProtocols != NULLKenny Root2013-05-291-14/+19
* | | am c741f147: Merge "NativeCrypto: change debug format string to "%.*s""Kenny Root2013-05-291-2/+2
|\ \ \ | |/ /
| * | NativeCrypto: change debug format string to "%.*s"Kenny Root2013-05-291-2/+2
| |/
* | am 9fe691c8: Merge "NativeCrypto: add debug option for SSL streams"Kenny Root2013-05-281-0/+78
|\ \ | |/
| * NativeCrypto: add debug option for SSL streamsKenny Root2013-05-281-0/+78
* | am 99e1ae90: Merge "NativeCrypto: Fix a lot of random doc bugs"Kenny Root2013-05-0825-69/+37
|\ \ | |/
| * Merge "NativeCrypto: Fix a lot of random doc bugs"Kenny Root2013-05-0725-69/+37
| |\
| | * NativeCrypto: Fix a lot of random doc bugsKenny Root2013-05-0725-69/+37
* | | am 4ffab68b: Merge "NativeCrypto: use strings instead of loading class"Kenny Root2013-05-081-65/+63
|\ \ \ | |/ /
| * | Merge "NativeCrypto: use strings instead of loading class"Kenny Root2013-05-071-65/+63
| |\ \
| | * | NativeCrypto: use strings instead of loading classKenny Root2013-05-071-65/+63
| | |/
* | | am 30abb655: Merge "NativeCrypto: make our own X.509 key class"Kenny Root2013-05-082-2/+87
|\ \ \ | |/ /
| * | Merge "NativeCrypto: make our own X.509 key class"Kenny Root2013-05-072-2/+87
| |\ \ | | |/ | |/|
| | * NativeCrypto: make our own X.509 key classKenny Root2013-05-072-2/+87
* | | am dafcbf80: Merge changes Ided7a6bf,I61339e02Kenny Root2013-05-081-3/+5
|\ \ \ | |/ /
| * | NativeCrypto: inline call to peekIntKenny Root2013-05-061-2/+5
| * | NativeCrypto: remove unused importKenny Root2013-05-061-1/+0
| |/
* | am ab4ab99b: Merge "NativeCrypto: remove dep on Android host verifier"Kenny Root2013-05-061-3/+48
|\ \ | |/
| * Merge "NativeCrypto: remove dep on Android host verifier"Kenny Root2013-05-061-3/+48
| |\
| | * NativeCrypto: remove dep on Android host verifierKenny Root2013-05-061-3/+48
* | | am 7b65c5f0: Merge "NativeCrypto: pull in copy of EmptyArray"Kenny Root2013-05-0611-10/+45
|\ \ \ | |/ /
| * | NativeCrypto: pull in copy of EmptyArrayKenny Root2013-05-0611-10/+45
| |/
* | am 3e7a5a21: Merge "NativeCrypto: replace Harmony routines with OpenSSL"Kenny Root2013-05-063-82/+40
|\ \ | |/
| * NativeCrypto: replace Harmony routines with OpenSSLKenny Root2013-05-063-82/+40
* | am aed4814b: Merge "NativeCrypto: exit early when ssl_session is null"Kenny Root2013-05-031-0/+3
|\ \ | |/
| * NativeCrypto: exit early when ssl_session is nullKenny Root2013-05-031-0/+3
* | am 6821dc7b: Merge "NativeCrypto: move key conversion to Java"Kenny Root2013-05-035-204/+83
|\ \ | |/