summaryrefslogtreecommitdiffstats
path: root/crypto/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Move conscrypt out to external/conscryptKenny Root2013-10-01121-26454/+0
* Remove unsupported Cipher modesKenny Root2013-09-302-82/+17
* Conscrypt: correct key selection with no sigAlgKenny Root2013-09-271-3/+4
* Conscrypt: add SHA-224 with testsKenny Root2013-09-264-0/+51
* Do not throw exception on Mac#resetKenny Root2013-09-251-0/+4
* Revert "Restore NativeCrypto#encodeCertificates for now"Kenny Root2013-09-121-10/+0
* Fix buildKenny Root2013-09-121-0/+1
* Restore NativeCrypto#encodeCertificates for nowKenny Root2013-09-121-0/+9
* Conscrypt: use certificate references in SSL codeKenny Root2013-09-123-36/+50
* 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
* Register Conscrypt as the AlgNameMapper sourceKenny Root2013-09-063-37/+58
* 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-301-4/+5
|/
* If libcore wants ASCII casing, it needs to ask for it like everyone else.Elliott Hughes2013-08-021-2/+3
* am 4c88ce8d: Merge "NativeCrypto: Add ALPN support"Kenny Root2013-06-262-3/+49
|\
| * NativeCrypto: Add ALPN supportKenny Root2013-06-252-3/+49
* | 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-062-82/+29
|\ \ | |/
| * NativeCrypto: replace Harmony routines with OpenSSLKenny Root2013-05-062-82/+29
* | am 6821dc7b: Merge "NativeCrypto: move key conversion to Java"Kenny Root2013-05-033-42/+43
|\ \ | |/
| * NativeCrypto: move key conversion to JavaKenny Root2013-05-033-42/+43
* | am 603a9f11: Merge "Move encoding method out of NativeCrypto"Kenny Root2013-05-032-11/+10
|\ \ | |/
| * Move encoding method out of NativeCryptoKenny Root2013-05-032-11/+10
* | am 9eda20c2: Merge "NativeCrypto: build native library standalone"Kenny Root2013-05-022-5/+9
|\ \ | |/
| * NativeCrypto: build native library standaloneKenny Root2013-05-022-5/+9
* | am 0800e47a: Merge "Move JSSE to new package"Kenny Root2013-04-29118-0/+26148
|\ \ | |/
| * Move JSSE to new packageKenny Root2013-04-29118-0/+26144
|/
* merge more modules into luniPeter Hallam2010-04-2747-8149/+0
* resolved conflicts for merge of dd53c703 to dalvik-devElliott Hughes2010-04-051-8/+0
|\