@@ -4041,6 +4041,7 @@ This option can be used instead of

 .B \-\-ca, \-\-cert,

 and

 .B \-\-key.

+Not available with PolarSSL.

 .\"*********************************************************

 .TP

 .B \-\-verify-hash hash

@@ -2265,12 +2265,16 @@ options_postprocess_verify_ce (const struct options *options, const struct conne

 #endif

       if (options->pkcs12_file)

         {

+#ifdef USE_POLARSSL

+	  msg(M_USAGE, "Parameter --pkcs12 cannot be used with the PolarSSL version version of OpenVPN.");

+#else

           if (options->ca_path)

 	    msg(M_USAGE, "Parameter --capath cannot be used when --pkcs12 is also specified.");

           if (options->cert_file)

 	    msg(M_USAGE, "Parameter --cert cannot be used when --pkcs12 is also specified.");

           if (options->priv_key_file)

 	    msg(M_USAGE, "Parameter --key cannot be used when --pkcs12 is also specified.");

+#endif

         }

       else

         {

@@ -220,6 +220,7 @@ tls_ctx_load_pkcs12(struct tls_root_ctx *ctx, const char *pkcs12_file,

     )

 {

   msg(M_FATAL, "PKCS #12 files not yet supported for PolarSSL.");

+  return 0;

 }

 #ifdef WIN32