summaryrefslogtreecommitdiffstats
path: root/net/base/x509_certificate_openssl.cc
Commit message (Collapse)AuthorAgeFilesLines
* Fix for bug 5232736 Remove "DigiNotar Root CA"Kristian Monsen2011-09-011-0/+5
| | | | | | | | | | Chery pick of: http://src.chromium.org/viewvc/chrome?view=rev&revision=98750 http://codereview.chromium.org/7791032/diff/6001/net/base/x509_certificate.cc This should be it for master. Change-Id: I077b2efb328bda349232cd6e3e3f69e1c5460367
* Merge Chromium at r12.0.742.93: Fix conflicts in x509_certificate*Kristian Monsen2011-07-081-28/+26
| | | | | | | | | | Changes close to local edits, moved functions to bottom of section. Several upstream CL's: http://codereview.chromium.org/4645001 http://codereview.chromium.org/6793041 Change-Id: I173e5bb2abadfd1f4ca5edbaedd3a564a648ca86
* Merge Chromium at r12.0.742.93: Initial merge by gitKristian Monsen2011-07-081-35/+89
| | | | Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
* Merge Chromium at r11.0.696.0: Initial merge by gitKristian Monsen2011-06-291-1/+1
| | | | Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
* Merge Chromium at 10.0.621.0: Initial merge by git.Kristian Monsen2011-05-161-21/+48
| | | | Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
* Merge chromium at 9.0.597.55: Initial merge by git.Ben Murdoch2011-01-111-3/+9
| | | | Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
* Cherrypick Chrome's code that returns the certificate chain in DER format.Huahui Wu2010-12-081-0/+23
| | | | Change-Id: Idad3f105396174f76143d6e57aff99660443917a
* Merge Chromium at r66597: Fix conflicts.Ben Murdoch2010-12-031-5/+1
| | | | | | | | | | | | | | | | build_config.h http://src.chromium.org/viewvc/chrome?view=rev&revision=65920 pref_value_store.cc|h http://src.chromium.org/viewvc/chrome?view=rev&revision=66426 personal_data_manager.cc http://src.chromium.org/viewvc/chrome?view=rev&revision=65830 x509_certificate_openssl.cc http://src.chromium.org/viewvc/chrome?view=rev&revision=66413 Change-Id: I2eab5c3e50a2fa4d79da023049681d36ca4bc0da
* Merge Chromium at r66597: Initial merge by git.Ben Murdoch2010-12-031-11/+37
| | | | Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
* Merge Chromium at r65505: OpenSSL supportBen Murdoch2010-11-191-7/+13
| | | | | | | | Import OpenSSL support and tweak for our Chromium port (JNI functions). See https://chromereview.prom.corp.google.com/2010002/ Change-Id: Ia081dd3b1eae5ec05ebb96b66b682f039bfa1b81
* Merge Chromium at r65505: Initial merge by git.Ben Murdoch2010-11-181-77/+19
| | | | Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
* Temporarily disable X509 certificate verification.Iain Merrick2010-11-041-1/+7
| | | | | | | | Broken in recent Chromium merge (https://android-git.corp.google.com/g/77650). We use the same workaround as Chrome: log a warning, ignore the error. We're still pulling changes from Chrome so we expect this to be fixed soon. Change-Id: I8e6d8aa5ccb341d156a9623841200e631816b2a6
* Merge Chromium at r63472 : Fix conflicts.Iain Merrick2010-11-031-72/+0
| | | | | | | | | | | | | | | | | | | | | | SharedMemory added to stats_table.cc, duplicating Android change. http://src.chromium.org/viewvc/chrome?view=rev&revision=62510 chrome/browser/guid.h added to chrome/browser/autofill: http://src.chromium.org/viewvc/chrome?view=rev&revision=63173 chrome_thread.h renamed to browser_thread.h: http://src.chromium.org/viewvc/chrome?view=rev&revision=62286 DnsRRResolverWorker substantially overhauled: http://src.chromium.org/viewvc/chrome?view=rev&revision=61071 X509 certificates added for OpenSSL (replacing old Android hacks): http://src.chromium.org/viewvc/chrome?view=rev&revision=61955 OpenSSL now available in Chrome (previously enabled for Android only): http://src.chromium.org/viewvc/chrome?view=rev&revision=60936 Change-Id: I42e4fefcdabd996cb3c173dc412318b8c5ee20e2
* Merge Chromium at r63472 : Initial merge by git.Iain Merrick2010-11-031-0/+489
| | | | Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
* Final fixing of ANDROID guardsKristian Monsen2010-10-271-0/+2
| | | | | | Verified that we now are in sync with chromium revision 61029 Change-Id: I49834ac6c0c422ab0d9a82caa02bdc63f456eadd
* Merge Chromium at 7.0.540.0 : Manual merge of OpenSSL code.Iain Merrick2010-10-191-0/+6
| | | | | | | | | | | | | | We had redundant work in the Android and Chrome trees, and git failed to merge them. I'm intentionally replacing the Android code with the Chrome code here. The Chrome code is still being actively developed, and we want to be able to merge fixes from there directly into Android. x509_certificate_openssl.cc doesn't exist in the Chrome code yet, but it will soon. Keeping it as a dummy implementation for now. Change-Id: I1204d6274ce312d76d0533288cd51182e3f16491
* Collection of all the changs to external chromium.Ben Murdoch2010-08-111-0/+64
Time is running out, I guess we have to submit this and remember to upstream. Rebased to chromium r53293 Change-Id: Ie61ca0433b1eedd90144aee87c5efcd68fdc37ac
generated by cgit v1.1 at 2025-01-26 15:44:21 +0000