DtlsIdentityStore[Interface/Impl] updated, DtlsIdentityService to be removed

talk/app/webrtc/test/fakedtlsidentitystore.h

 /*
  * libjingle
  * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 10 matching lines @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef TALK_APP_WEBRTC_TEST_FAKEDTLSIDENTITYSERVICE_H_
 #define TALK_APP_WEBRTC_TEST_FAKEDTLSIDENTITYSERVICE_H_
 
+#include <string>
+
+#include "talk/app/webrtc/dtlsidentitystore.h"
 #include "talk/app/webrtc/peerconnectioninterface.h"
 
 static const char kRSA_PRIVATE_KEY_PEM[] =
     "-----BEGIN RSA PRIVATE KEY-----\n"
     "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMYRkbhmI7kVA/rM\n"
     "czsZ+6JDhDvnkF+vn6yCAGuRPV03zuRqZtDy4N4to7PZu9PjqrRl7nDMXrG3YG9y\n"
     "rlIAZ72KjcKKFAJxQyAKLCIdawKRyp8RdK3LEySWEZb0AV58IadqPZDTNHHRX8dz\n"
     "5aTSMsbbkZ+C/OzTnbiMqLL/vg6jAgMBAAECgYAvgOs4FJcgvp+TuREx7YtiYVsH\n"
     "mwQPTum2z/8VzWGwR8BBHBvIpVe1MbD/Y4seyI2aco/7UaisatSgJhsU46/9Y4fq\n"
     "2TwXH9QANf4at4d9n/R6rzwpAJOpgwZgKvdQjkfrKTtgLV+/dawvpxUYkRH4JZM1\n"
@@ skipping 13 matching lines @@
     "ZWJSVEMwHhcNMTQwMTAyMTgyNDQ3WhcNMTQwMjAxMTgyNDQ3WjARMQ8wDQYDVQQD\n"
     "EwZXZWJSVEMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMYRkbhmI7kVA/rM\n"
     "czsZ+6JDhDvnkF+vn6yCAGuRPV03zuRqZtDy4N4to7PZu9PjqrRl7nDMXrG3YG9y\n"
     "rlIAZ72KjcKKFAJxQyAKLCIdawKRyp8RdK3LEySWEZb0AV58IadqPZDTNHHRX8dz\n"
     "5aTSMsbbkZ+C/OzTnbiMqLL/vg6jAgMBAAEwDQYJKoZIhvcNAQELBQADgYEAUflI\n"
     "VUe5Krqf5RVa5C3u/UTAOAUJBiDS3VANTCLBxjuMsvqOG0WvaYWP3HYPgrz0jXK2\n"
     "LJE/mGw3MyFHEqi81jh95J+ypl6xKW6Rm8jKLR87gUvCaVYn/Z4/P3AqcQTB7wOv\n"
     "UD0A8qfhfDM+LK6rPAnCsVN0NRDY3jvd6rzix9M=\n"
     "-----END CERTIFICATE-----\n";
 
-using webrtc::DTLSIdentityRequestObserver;
+class FakeDtlsIdentityStore : public webrtc::DtlsIdentityStoreInterface,
+                              public rtc::MessageHandler {
+ public:
+  typedef rtc::TypedMessageData<rtc::scoped_refptr<
+      webrtc::DtlsIdentityRequestObserver> > MessageData;
 
-class FakeIdentityService : public webrtc::DTLSIdentityServiceInterface,
-                            public rtc::MessageHandler {
- public:
-  struct Request {
-    Request(const std::string& common_name,
-            DTLSIdentityRequestObserver* observer)
-        : common_name(common_name), observer(observer) {}
-
-    std::string common_name;
-    rtc::scoped_refptr<DTLSIdentityRequestObserver> observer;
-  };
-  typedef rtc::TypedMessageData<Request> MessageData;
-
-  FakeIdentityService() : should_fail_(false) {}
+  FakeDtlsIdentityStore() : should_fail_(false) {}
 
   void set_should_fail(bool should_fail) {
     should_fail_ = should_fail;
   }
 
-  // DTLSIdentityServiceInterface implemenation.
-  virtual bool RequestIdentity(const std::string& identity_name,
-                               const std::string& common_name,
-                               DTLSIdentityRequestObserver* observer) {
-    MessageData* msg = new MessageData(Request(common_name, observer));
-    if (should_fail_) {
-      rtc::Thread::Current()->Post(this, MSG_FAILURE, msg);
-    } else {
-      rtc::Thread::Current()->Post(this, MSG_SUCCESS, msg);
-    }
-    return true;
+  void RequestIdentity(
+      rtc::KeyType key_type,
+      const rtc::scoped_refptr<webrtc::DtlsIdentityRequestObserver>&
+          observer) override {
+    // TODO(hbos): Should be able to generate KT_ECDSA too.
+    DCHECK(key_type == rtc::KT_RSA || should_fail_);
+    MessageData* msg = new MessageData(
+        rtc::scoped_refptr<webrtc::DtlsIdentityRequestObserver>(observer));
+    rtc::Thread::Current()->Post(
+        this, should_fail_ ? MSG_FAILURE : MSG_SUCCESS, msg);
   }
 
  private:
   enum {
     MSG_SUCCESS,
     MSG_FAILURE,
   };
 
   // rtc::MessageHandler implementation.
   void OnMessage(rtc::Message* msg) {
-    FakeIdentityService::MessageData* message_data =
-        static_cast<FakeIdentityService::MessageData*>(msg->pdata);
-    DTLSIdentityRequestObserver* observer = message_data->data().observer.get();
+    MessageData* message_data = static_cast<MessageData*>(msg->pdata);
+    rtc::scoped_refptr<webrtc::DtlsIdentityRequestObserver> observer =
+        message_data->data();
     switch (msg->message_id) {
       case MSG_SUCCESS: {
-        std::string cert, key;
-        GenerateIdentity(message_data->data().common_name, &cert, &key);
+        std::string cert;
+        std::string key;
+        rtc::SSLIdentity::PemToDer("CERTIFICATE", kCERT_PEM, &cert);
+        rtc::SSLIdentity::PemToDer("RSA PRIVATE KEY", kRSA_PRIVATE_KEY_PEM,
+                                   &key);
         observer->OnSuccess(cert, key);
         break;
       }
       case MSG_FAILURE:
         observer->OnFailure(0);
         break;
     }
     delete message_data;
   }
 
-  void GenerateIdentity(
-      const std::string& common_name,
-      std::string* der_cert,
-      std::string* der_key) {
-    rtc::SSLIdentity::PemToDer("CERTIFICATE", kCERT_PEM, der_cert);
-    rtc::SSLIdentity::PemToDer("RSA PRIVATE KEY",
-                                     kRSA_PRIVATE_KEY_PEM,
-                                     der_key);
-  }
-
   bool should_fail_;
 };
 
 #endif  // TALK_APP_WEBRTC_TEST_FAKEDTLSIDENTITYSERVICE_H_