From patchwork Fri Oct 15 08:24:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Gaudig X-Patchwork-Id: 1541465 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=A2StCOpv; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::a3d; helo=mail-vk1-xa3d.google.com; envelope-from=swupdate+bncbaabb37vusfqmgqeqdylohi@googlegroups.com; receiver=) Received: from mail-vk1-xa3d.google.com (mail-vk1-xa3d.google.com [IPv6:2607:f8b0:4864:20::a3d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HVzq645chz9ssD for ; Fri, 15 Oct 2021 19:25:22 +1100 (AEDT) Received: by mail-vk1-xa3d.google.com with SMTP id k22-20020a056122107600b002a2cf213c76sf3425485vko.20 for ; Fri, 15 Oct 2021 01:25:22 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1634286320; cv=pass; d=google.com; s=arc-20160816; b=gilY1dN8miCPxEvaH1QjtgJbOZO+UQoP/03Wz8ltw+Eh+GGaB3P+yfpiG5Gd0KomyT 88TWb1UEKJLfJakaOrdp01js1FqtebiiGX1iP+6jHey1eJMDJ3QMG5+9tOxbGBMiDMm5 xv8QeA1zC76fg9XZ19RizwM4UNeqqALtS70YR1F+2WuwkXVjOQTf6uld3/bJdHoYrH36 OfDyEG29lqVgevjLmsmZ9i0KhPDfHzy3PjxArCgGJ0WJEYcA2hMZuKQW2+s/9f+D3o00 M/ivmHX7rUhqJZ0wkAprzs8w4YYigldm9A5R6HXvcMIOqbiDDW5u5wB5sptFL0yFzR+n liZQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=AN4ji3npDjuJFMM70I5GkqDaqShHfnMc6v4j2TmDdp0=; b=B121Jh0kOccCZ5HeUPhddzLUCdv9HXNSv4D4LkN9J1BzKCsbV6wiswv60VNQueGY/m 3TcSzkWzIqbRpkeFcN2l0X7F0mQufC/sJlu98pV+J6cs5YKCl/3Hi9pOv0mRBPQwXaE8 yEiTmxjc0l9ZcapectBmWTA+6CNj3DqwhUVyeoh79S7gdRfhRBINdXvz9mVrnSS4DV3Q Y8VMdI2UDCTf3tJHOD7N5wFEaFPeybUyTx/6hCKoWaqL6L0MZqoUwNwJqdqQkyATXwUO 2GT5+abjjcNBIBpP6Aau1FJtHe0QbJPYAKVcrQqKqUR+IVJvPecMClaiLNpa9p0Ss+dY cM4Q== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=1rq3iJvg; arc=pass (i=1 spf=pass spfdomain=weidmueller.com dkim=pass dkdomain=weidmueller.com dmarc=pass fromdomain=weidmueller.com); spf=pass (google.com: domain of roland.gaudig-oss@weidmueller.com designates 40.107.8.84 as permitted sender) smtp.mailfrom=roland.gaudig-oss@weidmueller.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=weidmueller.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=AN4ji3npDjuJFMM70I5GkqDaqShHfnMc6v4j2TmDdp0=; b=A2StCOpvCn1jXZGbABS9A+u7zGqhNNh4oD+6VatzmxGqmFiZX6m/AQ8lD1YJtes2we Hc1BF1DyOzEcjztb6+b81hkeBDY4lpNAi2An6Y/ZP4sf9T3v3/VMhCbGK/tsoJFamr4y 2yzaXHjfrcPHd0kAZKUCaha7PyXnT6Gfu92xD9y79Pmh67Jpw/q6+hLxSQ1lUdL3gIVS pxTZy71Ol5X/jEVbk2GnDrWmGF0L+4gzJDJuzRIUuUqdP2smKQ5F36UmDBQy+hoKLqMo 2ITDa3fVDalaDOacVW05nkwFeK9LitfqJY8NmwgieKLQV6HPNvQVWsUgTl8jrLluY1Zz jM5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=AN4ji3npDjuJFMM70I5GkqDaqShHfnMc6v4j2TmDdp0=; b=5l9NMdqVDTgP/NMx78OvOF3btjyAd4hqjk76mzEg0b2JRTkUle8sF5Dy5jrsC+AHGW LS/JY4/V3Xu20T5zT6n4Qt7THrk76Lu3P+Fh6MinR/UFuuqckG8o6ZijWd/E1K5nZH3X NvQrUO9n9usoGVAJxjwdulSSj1igASZOD0uwa9dgenXSZWbhmFHC2BHF9FBM//NZfrmB RvNqNA2Vtshv0aMUJchvVPOHFScEOEbgEkq468IP7nitYTrh7ndHyY6f6BG7wVmHlDK4 nGeRdY2ABo76bkEaNknSwqVAlMrCmla4d1C1Mm9FhwWh/hdRWJOHVoYq06dzavCqtKD4 4yBA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM530MfMFIOxbQJ6ZJ8OxbLPfGW9LEg0oPixOxgkPaAzOluY4S028A GSTcMwgSqCSWRel85kIEV/s= X-Google-Smtp-Source: ABdhPJxhWx2prVbBcKsUzkPEuzNB9U7U7ign7sqRRuqx7784wu6vXgX/WbuOSP6ri4YmnAkxfY/mdw== X-Received: by 2002:ab0:7a53:: with SMTP id a19mr11273773uat.126.1634286320041; Fri, 15 Oct 2021 01:25:20 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a67:df94:: with SMTP id x20ls1364801vsk.0.gmail; Fri, 15 Oct 2021 01:25:19 -0700 (PDT) X-Received: by 2002:a67:2f0d:: with SMTP id v13mr12210599vsv.18.1634286319639; Fri, 15 Oct 2021 01:25:19 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1634286319; cv=pass; d=google.com; s=arc-20160816; b=M4KFbzS+pTyqrB9QkHrLx8F663TT+GBtz9uBdru5k6Ke7NizjWzZqqv2r+UQaKJ+zN CSJizxKJHF4/dVoGPmyVX04Za9giTX2/2atyopWEzAbhfngaHlGZ0zDQNSxvCa9Co0cP 3+7mKQJEdPAVJvdVVGTL+kmZAO8troBkNejZ2CXOASy4EZlF8+qDTlHwAT1hXyqAM+B3 y7MIADz0957s6nDCKofjjKTtZk2FEHG6fudpVTgKyf0s5yeEq7G2+WjN8OnQwAqbDlUr RBpQxwE144bNTnwc9Rz9ov5aEc/EJE0DwcafmPLspaXc/Re0sa8Z8f/IzatHAy41EVcq ncIw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=OcDNrbILGZY+MrPQdmccLLjb8FJRXnZnCRl9Qxy7Hsw=; b=rx8pDAyrALjEYKbB1brxjrZ9/1/wKmML18A29S1ofdQHcuAQlLLTaQ2nc1DjtsKdAQ kH0wD9/3OiMrT5A2nzJt+zIPNH/Jhva+T5r3xWNXBXPzSrHxEDkXrYkhrqnArOYXeIOy CmMBe2a1KsyVEzEffe5AGVh4ycRHl1lLNHgo9rGEr5A7XJhrWEIkmt3UjxgsWsh+R0qs 2wJ1W/4kpaQzPUrct07PwE2B9shbo8hqDjc1dL67quH/5JWzA4qrOQEFWoEGKZUDuecH ydI24TgRt95Ckxoa2qXM+uFBTFaNVUcxLZfyIMnVRlYB7sYPc7esx6zVDSXMVoT1Uj3a MN6Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=1rq3iJvg; arc=pass (i=1 spf=pass spfdomain=weidmueller.com dkim=pass dkdomain=weidmueller.com dmarc=pass fromdomain=weidmueller.com); spf=pass (google.com: domain of roland.gaudig-oss@weidmueller.com designates 40.107.8.84 as permitted sender) smtp.mailfrom=roland.gaudig-oss@weidmueller.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=weidmueller.com Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80084.outbound.protection.outlook.com. [40.107.8.84]) by gmr-mx.google.com with ESMTPS id h133si286092vka.3.2021.10.15.01.25.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Oct 2021 01:25:19 -0700 (PDT) Received-SPF: pass (google.com: domain of roland.gaudig-oss@weidmueller.com designates 40.107.8.84 as permitted sender) client-ip=40.107.8.84; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JjLzUmxgWyRXuq8IAdODZfQq6bDewVqVKvyD7VUcprLPZdlpqZurF4sKI1X9zAkQVr0jgjf09HgKat67RhG7Cwnp0HN3gbbtZ1Jfg3t262fDxUsJth7XkviDEfrnPRjd8lOuPz+pLFHrkt9cdaQaVAmQyf6hkTqobIIw60sz1bFE3vLRnCfDjJPR+nZJFtmT6Lj43N5Iy35tZIJ+aB7I8mxo1ZmaEW5hcmDyYTIFzn5E8LZiwO42osm6E0HmWMMYApWKCzJyVA54sC9rlwgIAC+rzTUtJL0ko8t+cArxNrCAIqzDCZu/WHD5Arpw6QzDX5IxxIYPe7dKIahKYzHAYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OcDNrbILGZY+MrPQdmccLLjb8FJRXnZnCRl9Qxy7Hsw=; b=Uzp40vr3PEeyKXNG7OvuDNdDclwPFkbAFtcscssNjuWK5SFHzr5f7muQgeg/aimCHrqo/63EUymndBr/WhxI4luh4xx6TfNgLCmDAQE21ay/y7SXQaAzJSN8F6hS2rVZuVzkCaok0U3md/b2umFM9Lf7mmzS4bM/ODRl8W2tmI9Fg11EIwA+d3dhq0KzQndJ5J794QCov+lmykYOtzOTxvC80GsdfGPM5iGFpp4War1+ZoIfIpcjfwXkS0Elp478sbl9h77z4+qXhbQHUyw6qMVe//Bz2k9u73yq/+CuaNzXzIyIvlRa7CpKdHaTOR444mj/CC76v4YLvF3iOiiuug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none Received: from AM4PR08MB2658.eurprd08.prod.outlook.com (2603:10a6:205:a::27) by AM9PR08MB6707.eurprd08.prod.outlook.com (2603:10a6:20b:305::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Fri, 15 Oct 2021 08:25:17 +0000 Received: from AM4PR08MB2658.eurprd08.prod.outlook.com ([fe80::8821:a0b2:5af2:ae97]) by AM4PR08MB2658.eurprd08.prod.outlook.com ([fe80::8821:a0b2:5af2:ae97%4]) with mapi id 15.20.4608.017; Fri, 15 Oct 2021 08:25:17 +0000 From: Roland Gaudig To: swupdate@googlegroups.com Cc: sbabic@denx.de, christian.peters@weidmueller.com, Roland Gaudig Subject: [swupdate] [PATCH v1 7/8] channel_curl: add separate error codes for SSL Date: Fri, 15 Oct 2021 08:24:56 +0000 Message-Id: <20211015082457.6804-8-roland.gaudig-oss@weidmueller.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211015082457.6804-1-roland.gaudig-oss@weidmueller.com> References: <20211015082457.6804-1-roland.gaudig-oss@weidmueller.com> X-ClientProxiedBy: AS9PR0301CA0044.eurprd03.prod.outlook.com (2603:10a6:20b:469::16) To AM4PR08MB2658.eurprd08.prod.outlook.com (2603:10a6:205:a::27) MIME-Version: 1.0 Received: from DE12086.weidmueller.com.com (84.138.74.49) by AS9PR0301CA0044.eurprd03.prod.outlook.com (2603:10a6:20b:469::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.14 via Frontend Transport; Fri, 15 Oct 2021 08:25:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 28758346-af06-4ff4-95b3-08d98fb551fe X-MS-TrafficTypeDiagnostic: AM9PR08MB6707: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3826; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PIo/kllvA7pzoQjzjfAfYLYh/3AzJ7mUn5cwLnVKdVu6EAcmzq13A/EKiormerbLwT8Mqabgvnv9tshWsFTLI63cpQuh75nuCtQY0rNuhor3cP1Um98En+WnJ4RBulEajBYJBAl3xFuJSbvI8oI3lCTjBvMrACvOnAsC6VOTFGVvV1FG4I5MbIPUDnhJyQfJjld0bGaIDiSc7AOwQFXbMM5xOsuiCLqvrzWTERFthOMrig8k5L5JCi6MYC1I0IQ8mCgqA0I6ZOlYaZyaofATLuqDOCOF4e0Zfw0xxO2J7RFCbtcSz5jd9JxLw4ldBU+q6z2A8o0nwB3CSP5hh8Jy9yAvra2Q5lubiFGYsd0MFehysXAErmuzYQMl6nLJd+K9UBzZZMA88+MoLF60wT46vghQqv3z/nTjyWM5KoAwz3ppPNwyA4EllD+EK7aQKcMKIIT4xBnE+1AJ1gjSm5ORFLwV32dPvZGgWnaRkBnLzmKN0z4c13cLPwO6BeuWS+U0isAU2hMicEU9Pr63ZQbfW2hs4xBZoGvD0LTYsHLT0J/h0vQ4KYhzPgkCVWAFRxU7SeDhVyUjWNH0JqUJpzsYmcO3fdbzvxXR0tdttnxdqjO6OpHIvpMxqKeea/QXb/DmEH0HQqGAuu/JYhvuBFTX67WkaKhPdzUcDocXAGyPI+Oo9ExitaxTLaSX0q+1uEycBPmtSv47UozWAWwigrxOiQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM4PR08MB2658.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(38100700002)(38350700002)(83380400001)(4326008)(6506007)(6486002)(1076003)(107886003)(2616005)(8936002)(66946007)(36756003)(186003)(26005)(66476007)(66556008)(8676002)(86362001)(956004)(6512007)(52116002)(6916009)(316002)(2906002)(7696005)(508600001)(6666004)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nkfyMBZEfyNWXuXsGwRhiSyt8kn36lWsmTYUUC5c2eo7jGOVd/EiiTrfuzEJy/pBNo1B65q2F+sPM0F44SESG47ePx8mDM3cWie09lbWsvuDHQcQ6AWA6YSw4F5owzGjx3NuQnZsB7yQ/UMgowLEbMuOdBCq5n0quNcK+I7qIzRKy82ZRTC/bRPLh8Cvl8ao9JnHXPEdF405072C+x/4nP+6Kxh3Lj59PGY0qT7ct/4YwiOJDtfWrnSxr5p1aGrZChxVqb5Pjpl2vjaUISISvjk3xp9jHL0axrkuK/8OlpDNjq8/bTCeJohMBMBWrKIQ71zniXbkxOTbbJ2HNNzmTggTdycu26dpZa6KCW8W/qRWeYuFB+xjBYv6KhVzn+XgPM2OaP/0mXKqpfne66s2aEvXvbsrGVGJxNyxlYnEdbqTyhYx5G5DNmM6fgX7Xglj33sYjybTPHp5GKQVP+Wtp+ObZDrOIF0lknzuIynD6ZE4+GP/nkwrrQxxzgSGx3z9SvALNM0gzIonlATZiLyQcyPakRY/jZed7XaeHkl063ZJpzYNu+afXcwCUnaEsI7psJZBruJcq5DLc6KDzI3BztjjuwGUuwN8tr1G1JZjWOardtdQ5QIr+cMYJ1WgZCKN5zcNQgKX/I3tDshEe/chAhjWnrH6E9QdyDtKWupYt5to1O5v6yA6jv34WrOOgywhHlXg8xVyk3Ogvj8xyKitILYxhgA0eCWfeItBlBa8/F9WVIq5SPDXcjwurRT9cLsBy3jsq7JFNCwBIbS3x4cBHT/yI9clBPWa+xeX1Z1TIgQvoxYgn4OTC4MuM0riVRvRCEh9vvo0B6MivtDwpuhy1q8G5OcMhz07h1qKA9KoVS1YZt73Gw7w+g8B1Rx4oURqFhwXs8WfCABOdY1G1UPW6q1mKjGD2Jcbk/hWT+cCG6U5f0oa21N+UdmjaCZnj26ikW+n/rPCdgjru38/4FbVgM1BASsxxrbZvdsQjgtzhr7NE4vs+DFagNAgwMVqQnMQsZen1hsVofVGrjiI4B0HbVkNekSATk6WRhMkPLoHlqp9TbHFSAs7VVMg5THTVXJ0KQjVdpq+Def3JramaDYPleQBhhICBJn0fgiGcXxLT7LjGrneghJF+czhlO1rddTqTpB4/fTnI1KFv9ZRYsn01D5AwCb6L0aSOC2Lm0Brv7wSrdlA0PkHks5ZFDEfH0J8WGMIwqwksy25WBPHsBLXX+k/a+TG4I5+ONrHFDWJsV1ZAgtqSdDTONbjByMVMi8B/7Ph9t6EinUh3PKVXO0iOvDH+A6IN/w+fVtGnTDt9VYeOCjJYiZNmWkAoaC5SmJs X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28758346-af06-4ff4-95b3-08d98fb551fe X-MS-Exchange-CrossTenant-AuthSource: AM4PR08MB2658.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2021 08:25:17.8636 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BRtm3U4JrkQpFGGyu0sLwyyakRrIIM6JayqfArghBQVZZ71dWqfOcRAUgFHaitRifPKfctUD4H7Aj4Vmyljhlg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR08MB6707 X-Original-Sender: roland.gaudig-oss@weidmueller.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=1rq3iJvg; arc=pass (i=1 spf=pass spfdomain=weidmueller.com dkim=pass dkdomain=weidmueller.com dmarc=pass fromdomain=weidmueller.com); spf=pass (google.com: domain of roland.gaudig-oss@weidmueller.com designates 40.107.8.84 as permitted sender) smtp.mailfrom=roland.gaudig-oss@weidmueller.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=weidmueller.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , From: Roland Gaudig SSL connection errors were mapped to CHANNEL_ENONET error code, which makes finding the cause of an error difficult. Therefore, errors regarding SSL handshake or certificate problems are separated now from other network problems. Signed-off-by: Roland Gaudig --- corelib/channel_curl.c | 12 +++++++----- include/channel_op_res.h | 4 +++- suricatta/common.c | 2 ++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/corelib/channel_curl.c b/corelib/channel_curl.c index fba773b..5140ef4 100644 --- a/corelib/channel_curl.c +++ b/corelib/channel_curl.c @@ -375,11 +375,6 @@ channel_op_res_t channel_map_curl_error(CURLcode res) case CURLE_COULDNT_RESOLVE_HOST: case CURLE_COULDNT_CONNECT: case CURLE_INTERFACE_FAILED: - case CURLE_SSL_CONNECT_ERROR: - case CURLE_PEER_FAILED_VERIFICATION: -#if LIBCURL_VERSION_NUM < 0x073E00 - case CURLE_SSL_CACERT: -#endif case CURLE_USE_SSL_FAILED: return CHANNEL_ENONET; case CURLE_OPERATION_TIMEDOUT: @@ -408,6 +403,13 @@ channel_op_res_t channel_map_curl_error(CURLcode res) case CURLE_REMOTE_ACCESS_DENIED: case CURLE_LOGIN_DENIED: return CHANNEL_EACCES; + case CURLE_PEER_FAILED_VERIFICATION: +#if LIBCURL_VERSION_NUM < 0x073E00 + case CURLE_SSL_CACERT: +#endif + return CHANNEL_ESSLCERT; + case CURLE_SSL_CONNECT_ERROR: + return CHANNEL_ESSLCONNECT; case CURLE_OK: return CHANNEL_OK; default: diff --git a/include/channel_op_res.h b/include/channel_op_res.h index 7c883b9..104ce32 100644 --- a/include/channel_op_res.h +++ b/include/channel_op_res.h @@ -23,5 +23,7 @@ typedef enum { CHANNEL_ELOOP, CHANNEL_EBADMSG, CHANNEL_ENOTFOUND, - CHANNEL_EREDIRECT + CHANNEL_EREDIRECT, + CHANNEL_ESSLCERT, + CHANNEL_ESSLCONNECT } channel_op_res_t; diff --git a/suricatta/common.c b/suricatta/common.c index 71aa2df..3a9ac60 100644 --- a/suricatta/common.c +++ b/suricatta/common.c @@ -56,6 +56,8 @@ server_op_res_t map_channel_retcode(channel_op_res_t response) switch (response) { case CHANNEL_ENONET: case CHANNEL_EAGAIN: + case CHANNEL_ESSLCERT: + case CHANNEL_ESSLCONNECT: return SERVER_EAGAIN; case CHANNEL_EACCES: return SERVER_EACCES;