soc.2009.transport: 915d1fbc: Added certificate for prpl-facebook and ...

[hanzz at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 915d1fbc42d35d9bca02244d2e9402c0410fa93d
Ancestor: 8fb27b5dd4bad511f0f973b110da2a6d2b5535d8
Author: hanzz at soc.pidgin.im
Date: 2009-07-23T08:15:56
Branch: im.pidgin.soc.2009.transport
URL: http://d.pidgin.im/viewmtn/revision/info/915d1fbc42d35d9bca02244d2e9402c0410fa93d

Added files:
        certificates/facebook.pem
Added directories:
        certificates
Modified files:
        CMakeLists.txt cmake_install.cmake localization.cpp
        protocols/facebook.cpp

ChangeLog: 

Added certificate for prpl-facebook and fixed mem-leak

-------------- next part --------------
============================================================
--- certificates/facebook.pem	95e6d2dd6733436f6c1ecee7264751969145ad1b
+++ certificates/facebook.pem	95e6d2dd6733436f6c1ecee7264751969145ad1b
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDUTCCArqgAwIBAgIDBRtMMA0GCSqGSIb3DQEBBAUAMFoxCzAJBgNVBAYTAlVT
+MRwwGgYDVQQKExNFcXVpZmF4IFNlY3VyZSBJbmMuMS0wKwYDVQQDEyRFcXVpZmF4
+IFNlY3VyZSBHbG9iYWwgZUJ1c2luZXNzIENBLTEwHhcNMDYxMjEzMDczMTQ5WhcN
+MTAwMTEyMDczMTQ5WjCBwDELMAkGA1UEBhMCVVMxGzAZBgNVBAoTEmxvZ2luLmZh
+Y2Vib29rLmNvbTETMBEGA1UECxMKR1QwNDQ4MjQ1MjExMC8GA1UECxMoU2VlIHd3
+dy5nZW90cnVzdC5jb20vcmVzb3VyY2VzL2NwcyAoYykwNjEvMC0GA1UECxMmRG9t
+YWluIENvbnRyb2wgVmFsaWRhdGVkIC0gUXVpY2tTU0woUikxGzAZBgNVBAMTEmxv
+Z2luLmZhY2Vib29rLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1R9N
+IM5CJpFurag3pBa3ZOahUvLgh9sGa2Ur0MT3+5tWJYw5ay2r74WK6dYv2bcrqDLU
+uyHWJWCeJewglGs2VZ3cOPxN9x68OPxuTP0IPpAJDpphFne3zTH5njkfitrV2oaW
+UgzbkbUEaFnVOpeScy9U4Ks6uVTgV+KNsZFEsCkCAwEAAaOBvTCBujAOBgNVHQ8B
+Af8EBAMCBPAwHQYDVR0OBBYEFM627PadoUPV4GdpPT8AbJOxchf+MDsGA1UdHwQ0
+MDIwMKAuoCyGKmh0dHA6Ly9jcmwuZ2VvdHJ1c3QuY29tL2NybHMvZ2xvYmFsY2Ex
+LmNybDAfBgNVHSMEGDAWgBS+qKB0clBrRLfJI9j7qP+zV2tobDAdBgNVHSUEFjAU
+BggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQQF
+AAOBgQBRlplWgG9NU89FVKCDkUNCoTqkdPJw4Nl7Ypdpf6WhPk3dq57teOseTKCf
+O3XxHLqz+EYslUO4K5l88RgF+dK+dlESmjmewAtADpkrSC4DHKg6fdFywObnD9b9
+TqibCw82YJ3b7v6G3Ec4ApD0sqiQqrz59pWjdFrZwagyT42YFw==
+-----END CERTIFICATE-----
============================================================
--- CMakeLists.txt	d320ea7390ecb415061d47e0b6c3fb521d28658c
+++ CMakeLists.txt	f3fed7e6a97c9db7d716745411ebeecfa7da076e
@@ -157,6 +157,11 @@
 	DESTINATION share/highflyer/locales
     )
 
+INSTALL(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/certificates/facebook.pem
+	DESTINATION share/highflyer/certificates
+    )
+
 # install(FILES
 # 	${CMAKE_CURRENT_SOURCE_DIR}/data/LICENSE.txt
 # 	${CMAKE_CURRENT_SOURCE_DIR}/data/TRANSLATIONS.txt
============================================================
--- cmake_install.cmake	22729754359de63c41053731739853f2b876ebb5
+++ cmake_install.cmake	d955155617147484c859845b54e18b768cd25435
@@ -58,6 +58,10 @@ ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${
   FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/share/highflyer/locales" TYPE FILE FILES "/home/hanzz/code/transport/locales/cs.po")
 ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" MATCHES "^(Unspecified)$")
 
+IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" MATCHES "^(Unspecified)$")
+  FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/share/highflyer/certificates" TYPE FILE FILES "/home/hanzz/code/transport/certificates/facebook.pem")
+ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" MATCHES "^(Unspecified)$")
+
 IF(CMAKE_INSTALL_COMPONENT)
   SET(CMAKE_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.txt")
 ELSE(CMAKE_INSTALL_COMPONENT)
============================================================
--- localization.cpp	461c7f5aab6cc8255f1c6010d96a07a17eea8313
+++ localization.cpp	31fff855cf9e56aaf656f7cd4d730bf798645ea1
@@ -55,8 +55,9 @@ bool Localization::loadLocale(const std:
 	// Already loaded
 	if (g_hash_table_lookup(m_locales, lang.c_str()))
 		return true;
-
-	pofile = po_file_read (g_build_filename(INSTALL_DIR, "share", "highflyer", "locales", std::string(lang + ".po").c_str(), NULL), error_handle);
+	char *l = g_build_filename(INSTALL_DIR, "share", "highflyer", "locales", std::string(lang + ".po").c_str(), NULL);
+	pofile = po_file_read (l, error_handle);
+	g_free(l);
 	if (pofile != NULL) {
 		GHashTable *locale = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 		Log().Get("Localization") << lang  << " locale found";
============================================================
--- protocols/facebook.cpp	244b863658a0d01f8490bee4701c41ded11cca2e
+++ protocols/facebook.cpp	72f657881385da950a7ed00aa625abd0d5542a47
@@ -47,7 +47,9 @@ FacebookProtocol::FacebookProtocol(Gloox
 		x509 = purple_certificate_pool_get_scheme(tls_peers);
 
 		/* Now load the certificate from disk */
-		crt = purple_certificate_import(x509, "certificate.pem");
+		char *c = g_build_filename(INSTALL_DIR, "share", "highflyer", "certificates", "facebook.pem", NULL);
+		crt = purple_certificate_import(x509, c);
+		g_free(c);
 		purple_certificate_pool_store(tls_peers, "login.facebook.com", crt);
 
 		/* And this certificate is not needed any more */