memset(ui_data, 0, sizeof(*ui_data));
ui_data->last_opt = &ui_data->form.opts;
ui_data->vpninfo = vpninfo;
+ ui_data->form.auth_id = (char *)"openssl_ui";
UI_add_user_data(ui, ui_data);
return 1;
if (vpninfo->cert_password) {
pass = vpninfo->cert_password;
vpninfo->cert_password = NULL;
- } else if (request_passphrase(vpninfo, &pass,
- _("Enter PEM pass phrase:")))
+ } else if (request_passphrase(vpninfo, "openconnect_pem",
+ &pass, _("Enter PEM pass phrase:")))
return -1;
plen = strlen(pass);
when PKCS12_parse() returns an error, but *ca is left pointing
to the freed memory. */
ca = NULL;
- if (!pass && request_passphrase(vpninfo, &pass,
+ if (!pass && request_passphrase(vpninfo, "openconnect_pkcs12", &pass,
_("Enter PKCS#12 pass phrase:")) < 0) {
PKCS12_free(p12);
return -EINVAL;
vpn_progress(vpninfo, PRG_ERR,
_("Parse PKCS#12 failed (see above errors)\n"));
PKCS12_free(p12);
+ free(pass);
return -EINVAL;
}
+ free(pass);
if (cert) {
char buf[200];
vpninfo->cert_x509 = cert;
ENGINE *e;
EVP_PKEY *key;
UI_METHOD *meth = NULL;
+ int ret = 0;
+
ENGINE_load_builtin_engines();
e = ENGINE_by_id("tpm");
_("Failed to set TPM SRK password\n"));
openconnect_report_ssl_errors(vpninfo);
}
+ vpninfo->cert_password = NULL;
+ free(vpninfo->cert_password);
} else {
/* Provide our own UI method to handle the PIN callback. */
meth = create_openssl_ui(vpninfo);
vpn_progress(vpninfo, PRG_ERR,
_("Failed to load TPM private key\n"));
openconnect_report_ssl_errors(vpninfo);
- ENGINE_free(e);
- ENGINE_finish(e);
- return -EINVAL;
+ ret = -EINVAL;
+ goto out;
}
if (!SSL_CTX_use_PrivateKey(vpninfo->https_ctx, key)) {
vpn_progress(vpninfo, PRG_ERR, _("Add key from TPM failed\n"));
openconnect_report_ssl_errors(vpninfo);
- ENGINE_free(e);
- ENGINE_finish(e);
- return -EINVAL;
+ ret = -EINVAL;
}
- return 0;
+ EVP_PKEY_free(key);
+ out:
+ ENGINE_finish(e);
+ ENGINE_free(e);
+ return ret;
}
#else
static int load_tpm_certificate(struct openconnect_info *vpninfo)
return -EIO;
}
vpninfo->cert_x509 = PEM_read_bio_X509_AUX(b, NULL, NULL, NULL);
+ BIO_free(b);
if (!vpninfo->cert_x509)
goto err;
return 0;
}
+#ifdef ANDROID_KEYSTORE
+static BIO *BIO_from_keystore(struct openconnect_info *vpninfo, const char *item)
+{
+ unsigned char *content;
+ BIO *b;
+ int len;
+ const char *p = item + 9;
+
+ /* Skip first two slashes if the user has given it as
+ keystore://foo ... */
+ if (*p == '/')
+ p++;
+ if (*p == '/')
+ p++;
+
+ len = keystore_fetch(p, &content);
+ if (len < 0) {
+ vpn_progress(vpninfo, PRG_ERR,
+ _("Failed to load item '%s' from keystore: %s\n"),
+ p, keystore_strerror(len));
+ return NULL;
+ }
+ if (!(b = BIO_new(BIO_s_mem())) || BIO_write(b, content, len) != len) {
+ vpn_progress(vpninfo, PRG_ERR,
+ _("Failed to create BIO for keystore item '%s'\n"),
+ p);
+ free(content);
+ BIO_free(b);
+ return NULL;
+ }
+ free(content);
+ return b;
+}
+#endif
+
+static int is_pem_password_error(struct openconnect_info *vpninfo)
+{
+ unsigned long err = ERR_peek_error();
+
+ openconnect_report_ssl_errors(vpninfo);
+
+#ifndef EVP_F_EVP_DECRYPTFINAL_EX
+#define EVP_F_EVP_DECRYPTFINAL_EX EVP_F_EVP_DECRYPTFINAL
+#endif
+ /* If the user fat-fingered the passphrase, try again */
+ if (ERR_GET_LIB(err) == ERR_LIB_EVP &&
+ ERR_GET_FUNC(err) == EVP_F_EVP_DECRYPTFINAL_EX &&
+ ERR_GET_REASON(err) == EVP_R_BAD_DECRYPT) {
+ vpn_progress(vpninfo, PRG_ERR,
+ _("Loading private key failed (wrong passphrase?)\n"));
+ ERR_clear_error();
+ return 1;
+ }
+
+ vpn_progress(vpninfo, PRG_ERR,
+ _("Loading private key failed (see above errors)\n"));
+ return 0;
+}
+
static int load_certificate(struct openconnect_info *vpninfo)
{
if (!strncmp(vpninfo->sslkey, "pkcs11:", 7) ||
vpn_progress(vpninfo, PRG_TRACE,
_("Using certificate file %s\n"), vpninfo->cert);
- if (vpninfo->cert_type == CERT_TYPE_PKCS12 ||
- vpninfo->cert_type == CERT_TYPE_UNKNOWN) {
+ if (strncmp(vpninfo->cert, "keystore:", 9) &&
+ (vpninfo->cert_type == CERT_TYPE_PKCS12 ||
+ vpninfo->cert_type == CERT_TYPE_UNKNOWN)) {
FILE *f;
PKCS12 *p12;
}
/* It's PEM or TPM now, and either way we need to load the plain cert: */
- if (!SSL_CTX_use_certificate_chain_file(vpninfo->https_ctx,
- vpninfo->cert)) {
- vpn_progress(vpninfo, PRG_ERR,
- _("Loading certificate failed\n"));
- openconnect_report_ssl_errors(vpninfo);
- return -EINVAL;
+#ifdef ANDROID_KEYSTORE
+ if (!strncmp(vpninfo->cert, "keystore:", 9)) {
+ BIO *b = BIO_from_keystore(vpninfo, vpninfo->cert);
+ if (!b)
+ return -EINVAL;
+ vpninfo->cert_x509 = PEM_read_bio_X509_AUX(b, NULL, pem_pw_cb, vpninfo);
+ BIO_free(b);
+ if (!vpninfo->cert_x509) {
+ vpn_progress(vpninfo, PRG_ERR,
+ _("Failed to load X509 certificate from keystore\n"));
+ openconnect_report_ssl_errors(vpninfo);
+ return -EINVAL;
+ }
+ if (!SSL_CTX_use_certificate(vpninfo->https_ctx, vpninfo->cert_x509)) {
+ vpn_progress(vpninfo, PRG_ERR,
+ _("Failed to use X509 certificate from keystore\n"));
+ openconnect_report_ssl_errors(vpninfo);
+ X509_free(vpninfo->cert_x509);
+ vpninfo->cert_x509 = NULL;
+ return -EINVAL;
+ }
+ } else
+#endif /* ANDROID_KEYSTORE */
+ {
+ if (!SSL_CTX_use_certificate_chain_file(vpninfo->https_ctx,
+ vpninfo->cert)) {
+ vpn_progress(vpninfo, PRG_ERR,
+ _("Loading certificate failed\n"));
+ openconnect_report_ssl_errors(vpninfo);
+ return -EINVAL;
+ }
+
+ /* Ew, we can't get it back from the OpenSSL CTX in any sane fashion */
+ reload_pem_cert(vpninfo);
}
- /* Ew, we can't get it back from the OpenSSL CTX in any sane fashion */
- reload_pem_cert(vpninfo);
+#ifdef ANDROID_KEYSTORE
+ if (!strncmp(vpninfo->sslkey, "keystore:", 9)) {
+ EVP_PKEY *key;
+ BIO *b;
+
+ again_android:
+ b = BIO_from_keystore(vpninfo, vpninfo->sslkey);
+ if (!b)
+ return -EINVAL;
+ key = PEM_read_bio_PrivateKey(b, NULL, pem_pw_cb, vpninfo);
+ BIO_free(b);
+ if (!key) {
+ if (is_pem_password_error(vpninfo))
+ goto again_android;
+ return -EINVAL;
+ }
+ if (!SSL_CTX_use_PrivateKey(vpninfo->https_ctx, key)) {
+ vpn_progress(vpninfo, PRG_ERR,
+ _("Failed to use private key from keystore\n"));
+ EVP_PKEY_free(key);
+ X509_free(vpninfo->cert_x509);
+ vpninfo->cert_x509 = NULL;
+ return -EINVAL;
+ }
+ return 0;
+ }
+#endif /* ANDROID */
if (vpninfo->cert_type == CERT_TYPE_UNKNOWN) {
FILE *f = fopen(vpninfo->sslkey, "r");
again:
if (!SSL_CTX_use_RSAPrivateKey_file(vpninfo->https_ctx, vpninfo->sslkey,
SSL_FILETYPE_PEM)) {
- unsigned long err = ERR_peek_error();
-
- openconnect_report_ssl_errors(vpninfo);
-
-#ifndef EVP_F_EVP_DECRYPTFINAL_EX
-#define EVP_F_EVP_DECRYPTFINAL_EX EVP_F_EVP_DECRYPTFINAL
-#endif
- /* If the user fat-fingered the passphrase, try again */
- if (ERR_GET_LIB(err) == ERR_LIB_EVP &&
- ERR_GET_FUNC(err) == EVP_F_EVP_DECRYPTFINAL_EX &&
- ERR_GET_REASON(err) == EVP_R_BAD_DECRYPT) {
- vpn_progress(vpninfo, PRG_ERR,
- _("Loading private key failed (wrong passphrase?)\n"));
+ if (is_pem_password_error(vpninfo))
goto again;
- }
-
- vpn_progress(vpninfo, PRG_ERR,
- _("Loading private key failed (see above errors)\n"));
return -EINVAL;
}
return 0;
#endif
SSL_CTX_set_default_verify_paths(vpninfo->https_ctx);
+#ifdef ANDROID_KEYSTORE
+ if (vpninfo->cafile && !strncmp(vpninfo->cafile, "keystore:", 9)) {
+ STACK_OF(X509_INFO) *stack;
+ X509_STORE *store;
+ X509_INFO *info;
+ BIO *b = BIO_from_keystore(vpninfo, vpninfo->cafile);
+
+ if (!b) {
+ close(ssl_sock);
+ return -EINVAL;
+ }
+
+ stack = PEM_X509_INFO_read_bio(b, NULL, NULL, NULL);
+ BIO_free(b);
+
+ if (!stack) {
+ vpn_progress(vpninfo, PRG_ERR,
+ _("Failed to read certs from CA file '%s'\n"),
+ vpninfo->cafile);
+ openconnect_report_ssl_errors(vpninfo);
+ close(ssl_sock);
+ return -ENOENT;
+ }
+
+ store = SSL_CTX_get_cert_store(vpninfo->https_ctx);
+
+ while ((info = sk_X509_INFO_pop(stack))) {
+ if (info->x509)
+ X509_STORE_add_cert(store, info->x509);
+ if (info->crl)
+ X509_STORE_add_crl(store, info->crl);
+ X509_INFO_free(info);
+ }
+ sk_X509_INFO_free(stack);
+ } else
+#endif
if (vpninfo->cafile) {
if (!SSL_CTX_load_verify_locations(vpninfo->https_ctx, vpninfo->cafile, NULL)) {
vpn_progress(vpninfo, PRG_ERR,
FD_CLR(vpninfo->ssl_fd, &vpninfo->select_efds);
vpninfo->ssl_fd = -1;
}
- if (final && vpninfo->https_ctx) {
- SSL_CTX_free(vpninfo->https_ctx);
- vpninfo->https_ctx = NULL;
+ if (final) {
+ if (vpninfo->https_ctx) {
+ SSL_CTX_free(vpninfo->https_ctx);
+ vpninfo->https_ctx = NULL;
+ }
+ if (vpninfo->cert_x509) {
+ X509_free(vpninfo->cert_x509);
+ vpninfo->cert_x509 = NULL;
+ }
}
}
projects / platform / upstream / openconnect.git / blobdiff