Changeset 5957 for pjproject/trunk/pjlib/src/pjlib-test/ssl_sock.c

Timestamp:

Mar 25, 2019 1:33:12 AM (5 years ago)

Author:

ming

Message:

Fixed #2185: Darwin (Mac OS & iOS) native SSL backend

File:

• pjproject/trunk/pjlib/src/pjlib-test/ssl_sock.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pjlib-test/ssl_sock.c

@@ -23 +23 @@
 
 #define CERT_DIR                    "../build/"
-#define CERT_CA_FILE                CERT_DIR "cacert.pem"
+#if (PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_DARWIN)
+/* If we use Darwin SSL, use the cert in DER format. */
+#   define CERT_CA_FILE             CERT_DIR "cacert.der"
+#else
+#   define CERT_CA_FILE             CERT_DIR "cacert.pem"
+#endif
 #define CERT_FILE                   CERT_DIR "cacert.pem"
 #define CERT_PRIVKEY_FILE           CERT_DIR "privkey.pem"
@@ -888 +893 @@
         pj_str_t privkey_pass = pj_str(CERT_PRIVKEY_PASS);
 
+#if (PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_DARWIN)
+        PJ_LOG(3, ("", "Darwin SSL requires the private key to be "
+                       "inside the Keychain. So double click on "
+                       "the file pjlib/build/privkey.p12 to "
+                       "place it in the Keychain. "
+                       "The password is \"pjsip\"."));
+#endif
+
 #if (defined(TEST_LOAD_FROM_FILES) && TEST_LOAD_FROM_FILES==1)
         status = pj_ssl_cert_load_from_files(pool, &ca_file, &cert_file,