commit 91053e7c5a743f4a92f5079844b0747c927f3bbd
author wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Sat Aug 10 07:18:04 2013 +0000
committer wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Sat Aug 10 07:18:04 2013 +0000
tree 11c170a43874b1f8f5af8b360fe9b0669d8bcdea
parent bf853f273255388d39bfd84c7f00088213daa1cf

Update libjingle to 50654631.

R=mallinath@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2000006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4519 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/base/sslidentity_unittest.cc

diff --git a/talk/base/sslidentity_unittest.cc b/talk/base/sslidentity_unittest.cc
index 2194517..6970426 100644
--- a/talk/base/sslidentity_unittest.cc
+++ b/talk/base/sslidentity_unittest.cc
@@ -32,6 +32,8 @@
 #include "talk/base/ssladapter.h"
 #include "talk/base/sslidentity.h"
 
+using talk_base::SSLIdentity;
+
 const char kTestCertificate[] = "-----BEGIN CERTIFICATE-----\n"
     "MIIB6TCCAVICAQYwDQYJKoZIhvcNAQEEBQAwWzELMAkGA1UEBhMCQVUxEzARBgNV\n"
     "BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRswGQYD\n"
@@ -70,8 +72,8 @@
   }
 
   virtual void SetUp() {
-    identity1_.reset(talk_base::SSLIdentity::Generate("test1"));
-    identity2_.reset(talk_base::SSLIdentity::Generate("test2"));
+    identity1_.reset(SSLIdentity::Generate("test1"));
+    identity2_.reset(SSLIdentity::Generate("test2"));
 
     ASSERT_TRUE(identity1_);
     ASSERT_TRUE(identity2_);
@@ -126,8 +128,8 @@
   }
 
  private:
-  talk_base::scoped_ptr<talk_base::SSLIdentity> identity1_;
-  talk_base::scoped_ptr<talk_base::SSLIdentity> identity2_;
+  talk_base::scoped_ptr<SSLIdentity> identity1_;
+  talk_base::scoped_ptr<SSLIdentity> identity2_;
   talk_base::scoped_ptr<talk_base::SSLCertificate> test_cert_;
 };
 
@@ -187,8 +189,17 @@
       "qCV42aXS3onOXDQ1ibuWq0fr0//aj0wo4KV474c=\n"
       "-----END CERTIFICATE-----\n";
 
-  talk_base::scoped_ptr<talk_base::SSLIdentity> identity(
-      talk_base::SSLIdentity::FromPEMStrings(kRSA_PRIVATE_KEY_PEM, kCERT_PEM));
+  talk_base::scoped_ptr<SSLIdentity> identity(
+      SSLIdentity::FromPEMStrings(kRSA_PRIVATE_KEY_PEM, kCERT_PEM));
   EXPECT_TRUE(identity);
   EXPECT_EQ(kCERT_PEM, identity->certificate().ToPEMString());
 }
+
+TEST_F(SSLIdentityTest, PemDerConversion) {
+  std::string der;
+  EXPECT_TRUE(SSLIdentity::PemToDer("CERTIFICATE", kTestCertificate, &der));
+
+  EXPECT_EQ(kTestCertificate, SSLIdentity::DerToPem(
+      "CERTIFICATE",
+      reinterpret_cast<const unsigned char*>(der.data()), der.length()));
+}