| commit | b609c228829bde15fd3ff4e9a4794bebb46b95d0 | [log] [tgz] |
|---|---|---|
| author | David Benjamin <davidben@google.com> | Wed Jul 12 17:26:06 2017 -0400 |
| committer | David Benjamin <davidben@google.com> | Thu Jul 13 16:08:04 2017 +0000 |
| tree | f210b3dadba9af31933b1c037021c795cce05f1d | |
| parent | f526081100c9028205fb960ccbdfc79c42f6bf5e [diff] [blame] |
Switch ssl_privkey to C++. In the process, merge the old canary function back in. Bug: 132 Change-Id: Ib455320ecea67c839d0b4ac3882669d24f832b74 Reviewed-on: https://boringssl-review.googlesource.com/17765 Reviewed-by: Steven Valdez <svaldez@google.com> Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index d825827..d2fe849 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt
@@ -24,8 +24,7 @@ ssl_ecdh.cc ssl_file.cc ssl_lib.cc - ssl_privkey.c - ssl_privkey_cc.cc + ssl_privkey.cc ssl_session.c ssl_stat.c ssl_transcript.c