generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update libjingle to 50654631.

Browse Source 
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
This commit is contained in:
wu@webrtc.org
2013-08-10 07:18:04 +00:00
parent bf853f2732
commit 91053e7c5a
50 changed files with 2377 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
talk/base/sslidentity.h
View File

@@ -64,8 +64,8 @@ class SSLCertificate {
// Compute the digest of the certificate given algorithm
virtual bool ComputeDigest(const std::string &algorithm,
unsigned char *digest, std::size_t size,
std::size_t *length) const = 0;
unsigned char* digest, std::size_t size,
std::size_t* length) const = 0;
};
// Our identity in an SSL negotiation: a keypair and certificate (both
@@ -93,8 +93,19 @@ class SSLIdentity {
// Returns a temporary reference to the certificate.
virtual const SSLCertificate& certificate() const = 0;
// Helpers for parsing converting between PEM and DER format.
static bool PemToDer(const std::string& pem_type,
const std::string& pem_string,
std::string* der);
static std::string DerToPem(const std::string& pem_type,
const unsigned char* data,
size_t length);
};
extern const char kPemTypeCertificate[];
extern const char kPemTypeRsaPrivateKey[];
} // namespace talk_base
#endif // TALK_BASE_SSLIDENTITY_H__