From patchwork Wed Jun 26 21:57:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenny Root X-Patchwork-Id: 288693 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "maxx.shmoo.com", Issuer "CA Cert Signing Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id E3BDB2C00D1 for ; Wed, 6 Nov 2013 11:43:22 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 23D799D226; Tue, 5 Nov 2013 19:43:21 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nWnd0rUR6CEv; Tue, 5 Nov 2013 19:43:20 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id D1EBC9D227; Tue, 5 Nov 2013 19:42:48 -0500 (EST) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 410379D1FE for ; Tue, 5 Nov 2013 19:42:46 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oWRLGp3uMDmm for ; Tue, 5 Nov 2013 19:42:41 -0500 (EST) Received: from mail-oa0-f74.google.com (mail-oa0-f74.google.com [209.85.219.74]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (not verified)) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id D33569D1E7 for ; Tue, 5 Nov 2013 19:42:33 -0500 (EST) Received: by mail-oa0-f74.google.com with SMTP id j17so294407oag.5 for ; Tue, 05 Nov 2013 16:42:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:date:subject:to:message-id; bh=B1sCQHHInKAbM41PMBWqT87MjQPIcrUGQqY1S5+0fkg=; b=RhqFWLVomI54iIW5m99UARuYlEB9aOlsJ1DEmQz5pRDFbA8vMpVA2Mcel71xvnRldA nvkBiS+wA7W2N2ij5fvYrP8ldm8qrj6lEUAK6uqPS+ZA9hVQIXM3N1khG4R6cEfm9kzM BBP/K23ZO8RXZ9vKWWg0DyKBOyKTUc+YR2AmhokaU/nUY9/95IhLIDlZmk3LeJAL9+sc rfioUxY3nNK0gGWM5+JWGgYYlw9SGt9uJo2hiVlgmrOqHl7BJCZqKo12FYCIeTyOX+oW D9kgdKl5dvPFcUf76ZkDgPoOl8hGg7ANb3pDp6dAhYLFJh/5CAWaUgG3f1tIiXuSSQSw v5vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:date:subject:to:message-id; bh=B1sCQHHInKAbM41PMBWqT87MjQPIcrUGQqY1S5+0fkg=; b=Ir3D3fxx7Ou13qObwMbTQo8co8OcK5usWqKsRUBENGHFHAheyfV/kt2yQ1e+kDWE41 fs0QgTZqo1/phJcMaPxAifyTE9JePMIjtJa2a7uMlxRrS7wgiE5xa54m2iPRv/LC0pf9 zxHkDCxFRTo01U5Ps1B1HBmZn1YXqOmIvkF7PUZ9uk3RxApI3Eiz2Mf1Mce6ZQ+LHliI NzN/ZJhOZnh4EIET/Psy9jCsYmotJBsOS55TzJe3L4GwxYhTkVQodas0RxS3hX5AkoCT 5I+A1V+oBKtPRbZXjRFH/G0aNbOeQBMFbUMU9hXAAfg70fWEQGKSzU+u4ruVI5cH2196 oGfg== X-Gm-Message-State: ALoCoQkw3uStw4zuBxSlhNhaXSJO/mzqTjRBLzIXmxe+aW/bV7op11o2Qom/jgjrAjja+au5/dwu9WCS7u5FW/d4+EC9PKN72vJrPcPg+ceZoks9qI6FyjpIqVD7HWZUKFfiH/3rXz73ts0iGWDo5gzpPYHtuuxF/PtLNIHqNAgVxDCSSolOcK0+jJrGRJJnWi2oD0h/cA1DouhoEZ6WW7r5wMpUMbcmCr0wJ/q4CHd//7/3G0P80tsItjBCjVWegr4nT46A5b2g X-Received: by 10.50.66.238 with SMTP id i14mr8552009igt.4.1383698553228; Tue, 05 Nov 2013 16:42:33 -0800 (PST) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id m48si3199660yho.6.2013.11.05.16.42.33 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Nov 2013 16:42:33 -0800 (PST) Received: from ushik.mtv.corp.google.com (ushik.mtv.corp.google.com [172.18.120.113]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 125545A41A1 for ; Tue, 5 Nov 2013 16:42:33 -0800 (PST) Received: by ushik.mtv.corp.google.com (Postfix, from userid 57417) id A452013FAD3; Tue, 5 Nov 2013 16:42:32 -0800 (PST) From: Kenny Root Date: Wed, 26 Jun 2013 14:57:31 -0700 Subject: [PATCH] Remove obsolete keystore path To: hostap@lists.shmoo.com Message-Id: <20131106004232.A452013FAD3@ushik.mtv.corp.google.com> X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.11 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com It's not possible to get a raw private key from keystore anymore, so this would fail every time anyway. Remove it so it doesn't confuse anyone that looks at this code. Change-Id: I021fc1707b16474d8698c85055a6fcc4095cd215 --- src/crypto/tls_openssl.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c index 2bf47c7..e226f1a 100644 --- a/src/crypto/tls_openssl.c +++ b/src/crypto/tls_openssl.c @@ -2035,26 +2035,6 @@ static int tls_connection_private_key(void *_ssl_ctx, break; } -#ifdef ANDROID - if (!ok && private_key && - os_strncmp("keystore://", private_key, 11) == 0) { - BIO *bio = BIO_from_keystore(&private_key[11]); - EVP_PKEY *pkey = NULL; - if (bio) { - pkey = PEM_read_bio_PrivateKey(bio, NULL, NULL, NULL); - BIO_free(bio); - } - if (pkey) { - if (SSL_use_PrivateKey(conn->ssl, pkey) == 1) { - wpa_printf(MSG_DEBUG, "OpenSSL: Private key " - "from keystore"); - ok = 1; - } - EVP_PKEY_free(pkey); - } - } -#endif /* ANDROID */ - while (!ok && private_key) { #ifndef OPENSSL_NO_STDIO if (SSL_use_PrivateKey_file(conn->ssl, private_key,