Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolved conflicts for merge of 6d66cf82 to mnc-dev-plus-aosp | Kenny Root | 2015-06-15 | 0 | -0/+0 |
|\ | |||||
| * | am 4bae3aba: Drop ECDHE-PSK-AES-128-GCM. | Adam Langley | 2015-06-15 | 4 | -23/+0 |
| |\ | |||||
| | * | Drop ECDHE-PSK-AES-128-GCM. | Adam Langley | 2015-06-15 | 4 | -23/+0 |
* | | | am 0e6bb1c7: Add ECDHE-PSK-AES{128,256}-SHA cipher suites. | Adam Langley | 2015-06-15 | 5 | -1/+38 |
|\ \ \ | |||||
| * | | | Add ECDHE-PSK-AES{128,256}-SHA cipher suites. | Adam Langley | 2015-06-15 | 5 | -1/+38 |
* | | | | am a4be71ce: Drop ECDHE-PSK-AES-128-GCM. | Adam Langley | 2015-06-15 | 4 | -23/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Drop ECDHE-PSK-AES-128-GCM. | Adam Langley | 2015-06-15 | 4 | -23/+0 |
* | | | | am 1f76c138: am dbfa1800: s/-Wno-unused-parameters/-Wno-unused-parameter/ | Adam Langley | 2015-06-12 | 0 | -0/+0 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | am dbfa1800: s/-Wno-unused-parameters/-Wno-unused-parameter/ | Adam Langley | 2015-06-12 | 1 | -9/+9 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | s/-Wno-unused-parameters/-Wno-unused-parameter/ | Adam Langley | 2015-06-12 | 1 | -9/+9 |
* | | | | am 9701a2fb: am 53b272a2: Bump revision of BoringSSL. | Adam Langley | 2015-06-12 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | am 53b272a2: Bump revision of BoringSSL. | Adam Langley | 2015-06-12 | 183 | -6365/+7246 |
| |\ \ \ | | |/ / | |||||
| | * | | Bump revision of BoringSSL. | Adam Langley | 2015-06-10 | 183 | -6365/+7246 |
* | | | | am cfb958c9: Fix Windows SDK build again | Kenny Root | 2015-06-09 | 2 | -2/+2 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fix Windows SDK build again | Kenny Root | 2015-06-08 | 2 | -2/+2 |
* | | | | am f4e42720: Bump revision of BoringSSL. | Adam Langley | 2015-06-09 | 185 | -6367/+7248 |
|\ \ \ \ | |/ / / | |||||
| * | | | Bump revision of BoringSSL. | Adam Langley | 2015-06-05 | 185 | -6367/+7248 |
* | | | | am 82ea5181: am 8bba6292: Disable 0xcafe cipher suite (PSK with AES-GCM). | Adam Langley | 2015-06-03 | 0 | -0/+0 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | am 8bba6292: Disable 0xcafe cipher suite (PSK with AES-GCM). | Adam Langley | 2015-06-03 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Disable 0xcafe cipher suite (PSK with AES-GCM). | Adam Langley | 2015-06-02 | 1 | -1/+1 |
* | | | | am 0d4deb2b: Disable 0xcafe cipher suite (PSK with AES-GCM). | Adam Langley | 2015-06-03 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Disable 0xcafe cipher suite (PSK with AES-GCM). | Adam Langley | 2015-06-02 | 1 | -1/+1 |
* | | | | am 15bef6ea: am 4f05b238: Add |BIO_read_asn1| to read a single ASN.1 object. | Adam Langley | 2015-05-22 | 0 | -0/+0 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | am 4f05b238: Add |BIO_read_asn1| to read a single ASN.1 object. | Adam Langley | 2015-05-22 | 3 | -1/+235 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Add |BIO_read_asn1| to read a single ASN.1 object. | Adam Langley | 2015-05-22 | 3 | -1/+235 |
* | | | | am 86426f7c: s/-Wno-unused-parameters/-Wno-unused-parameter/ | Adam Langley | 2015-05-21 | 1 | -9/+9 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | s/-Wno-unused-parameters/-Wno-unused-parameter/ | Adam Langley | 2015-05-21 | 1 | -9/+9 |
* | | | | am e1e9d3f1: am 3f3c43ff: external/boringssl: add -Wno-unused-parameters. | Adam Langley | 2015-05-21 | 0 | -0/+0 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | am 3f3c43ff: external/boringssl: add -Wno-unused-parameters. | Adam Langley | 2015-05-21 | 1 | -4/+9 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | external/boringssl: add -Wno-unused-parameters. | Adam Langley | 2015-05-21 | 1 | -4/+9 |
* | | | | am 16eeb4c7: am 58dc65d0: external/boringssl: fix |SSLeay|. | Adam Langley | 2015-05-21 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | am 58dc65d0: external/boringssl: fix |SSLeay|. | Adam Langley | 2015-05-21 | 2 | -5/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | external/boringssl: fix |SSLeay|. | Adam Langley | 2015-05-21 | 2 | -5/+6 |
* | | | | am 12addf8c: external/boringssl: fix |SSLeay|. | Adam Langley | 2015-05-20 | 2 | -5/+6 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | external/boringssl: fix |SSLeay|. | Adam Langley | 2015-05-19 | 2 | -5/+6 |
* | | | | am 71cbcbed: external/boringssl: add -Wno-unused-parameters. | Adam Langley | 2015-05-20 | 1 | -4/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | external/boringssl: add -Wno-unused-parameters. | Adam Langley | 2015-05-19 | 1 | -4/+9 |
* | | | | am 190eb169: external/boringssl: fix use after free in X509. | Adam Langley | 2015-05-20 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | external/boringssl: fix use after free in X509. | Adam Langley | 2015-05-19 | 1 | -1/+1 |
* | | | | am 3ca955ad: Copy ecdsa_meth in EC_KEY_copy. | Adam Langley | 2015-05-20 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Copy ecdsa_meth in EC_KEY_copy. | Adam Langley | 2015-05-19 | 1 | -0/+5 |
* | | | | am f5cea4e0: Add |BIO_read_asn1| to read a single ASN.1 object. | Adam Langley | 2015-05-19 | 3 | -1/+235 |
|\ \ \ \ | |/ / / | |||||
| * | | | Add |BIO_read_asn1| to read a single ASN.1 object. | Adam Langley | 2015-05-19 | 3 | -1/+235 |
* | | | | am fa32bda8: am 21c70997: Copy ecdsa_meth in EC_KEY_copy. | Adam Langley | 2015-05-15 | 0 | -0/+0 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | am 21c70997: Copy ecdsa_meth in EC_KEY_copy. | Adam Langley | 2015-05-15 | 1 | -0/+5 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Copy ecdsa_meth in EC_KEY_copy. | Adam Langley | 2015-05-15 | 1 | -0/+5 |
* | | | | Copy ecdsa_meth in EC_KEY_copy. | Adam Langley | 2015-05-15 | 1 | -0/+5 |
* | | | | am d4c52f48: am fc104df4: external/boringssl: disable ChaCha20-Poly1305 ciphe... | Adam Langley | 2015-05-14 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | am fc104df4: external/boringssl: disable ChaCha20-Poly1305 cipher suites. | Adam Langley | 2015-05-14 | 2 | -0/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | external/boringssl: disable ChaCha20-Poly1305 cipher suites. | Adam Langley | 2015-05-13 | 2 | -0/+4 |