From patchwork Thu Feb 23 14:14:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 94379 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp230529qgi; Thu, 23 Feb 2017 06:14:57 -0800 (PST) X-Received: by 10.237.34.239 with SMTP id q44mr34131589qtc.18.1487859297109; Thu, 23 Feb 2017 06:14:57 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id q14si3370989qkl.211.2017.02.23.06.14.56; Thu, 23 Feb 2017 06:14:57 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id B09B062C7C; Thu, 23 Feb 2017 14:14:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id BD391609AA; Thu, 23 Feb 2017 14:14:52 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id AA53C609AC; Thu, 23 Feb 2017 14:14:50 +0000 (UTC) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40105.outbound.protection.outlook.com [40.107.4.105]) by lists.linaro.org (Postfix) with ESMTPS id 8702260937 for ; Thu, 23 Feb 2017 14:14:48 +0000 (UTC) Received: from AM3PR07CA0047.eurprd07.prod.outlook.com (10.141.45.175) by HE1PR0701MB1738.eurprd07.prod.outlook.com (10.167.246.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.7; Thu, 23 Feb 2017 14:14:44 +0000 Received: from VE1EUR03FT024.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::207) by AM3PR07CA0047.outlook.office365.com (2a01:111:e400:882c::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.2 via Frontend Transport; Thu, 23 Feb 2017 14:14:45 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning linaro.org discourages use of 131.228.2.36 as permitted sender) Received: from hybrid2.ext.net.nokia.com (131.228.2.36) by VE1EUR03FT024.mail.protection.outlook.com (10.152.18.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.10 via Frontend Transport; Thu, 23 Feb 2017 14:14:45 +0000 Received: from fihe3nok1347.nsn-intra.net (10.158.36.135) by fihe3nok1347.nsn-intra.net (10.158.36.135) with Microsoft SMTP Server (TLS) id 15.1.466.34; Thu, 23 Feb 2017 16:14:35 +0200 Received: from mailrelay.int.nokia.com (10.130.128.21) by fihe3nok1347.nsn-intra.net (10.158.36.135) with Microsoft SMTP Server (TLS) id 15.1.466.34 via Frontend Transport; Thu, 23 Feb 2017 16:14:35 +0200 Received: from fihe3nok0734.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v1NEE8vI029192 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Feb 2017 16:14:09 +0200 Received: from 10.144.19.15 ([10.144.104.219]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v1NEE8UC029180 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Thu, 23 Feb 2017 16:14:08 +0200 X-HPESVCS-Source-Ip: 10.144.104.219 From: Petri Savolainen To: Date: Thu, 23 Feb 2017 16:14:05 +0200 Message-ID: <1487859248-23273-1-git-send-email-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.8.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:131.228.2.36; IPV:NLI; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(7916002)(39860400002)(39450400003)(39850400002)(39410400002)(39840400002)(2980300002)(189002)(199003)(36756003)(110136004)(626004)(38730400002)(305945005)(6666003)(53936002)(47776003)(77096006)(6916009)(5003940100001)(2351001)(5660300001)(106466001)(50986999)(105596002)(356003)(2906002)(450100001)(33646002)(92566002)(97736004)(189998001)(50226002)(48376002)(8676002)(86362001)(81166006)(68736007)(50466002)(22756006)(81156014)(8936002)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0701MB1738; H:hybrid2.ext.net.nokia.com; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; VE1EUR03FT024; 1:dW48FTA4xdVXjqqY2J/nX89tiNWGJNDIbh1k8oMxqfN5wPwzeQm++a9oK0QWI4boio40qvx15fBq09dnoOhT3YXwWucazbVsNUILSeVw76WS1j3CbNzzFKCdVDYnFjlv3DJPrjVEPULlowitw8DNjprX4JlN8lLyWJe76r7Pe7f95NbFDPnOs5VvxryLygi8D4BhFfAIGmQGWt9i+OoLV/TkXhXssGFt6eG5pvFfhrQs9kU26R1H4uM8FktZEpLq/jlLzXy1ZXJ1XSIA9scw4JMjZmcug1F17ATkOL1N/NzPTIMaa41TL3+7bvsIJ6RfbguBB13pbIiAX4ZBKUONY9wm8IYiVgXlS/uCcypTC3fNDHySFSy6DD9DEctcNmqh8+FuKZn3Xc6480nC95xoZlofNznj3kkzON39yNMMe1cGsYoWL5OMGW5ICFcsKU8lgDuXN5Med7nkamrJrpCgRA== X-MS-Office365-Filtering-Correlation-Id: 31420f30-eb6b-4e1c-bc87-08d45bf6515c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:HE1PR0701MB1738; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB1738; 3:+jz4QmDQbUD0NlgpbIg0xuan1PzuJxG1DJaaoqp2Q8cPHPwRdbWpLj+lXr5f6CDjXMr6nVH7dm7a+HOEJ7qDc5hTj3m3R6MLYdAVoX7fkdrAI4p8dyvptCeIhptAjuTgk43DxsYGs68RQF1dgDCZLAlUWRb0zXKnNLTsTA9LHZKL1oZvv9nK2oZpoUyU0v9O8Q0VMoWWT7F5m+Np3rdVB6pSjEflUqL2UYbmMPCDsQ94O8YBJ9UzXnW2Bwg+0lJ5iA4AAQYXJdt4hCqx7WQBT5knu6BZ7xSoIGWB4uCG+X+EGd3seSYCmez5N3q7MSgUsvYufAYxW/gv6nbhvMXg5qJC2MKhFI3skVWPvd9lXSVjG7BmpzThtrvNNVpM2FBo; 25:+T+euD2F0NosTHnz32cL0KrKz3j7C6YQc1SFBKlJ6/dY/mfS9UQnYv4EiKvLBGi0P7qoSpv+XK6m30kJ264MOszJs58xiLsEjQfha2UHC6l5Xqkr8I2+B8aHLxqbH+tDXQlFxbo27y/Fy9xQ3ae7fv06eSQ1szjSNMo02Nq/neIBnO5Fp0F0xeENnv8G06fcREeh7ANguCYssUCVafvNU2ex3U4WRvcRDeQiLDlzqFUjAuU+/G0BX72yLSYnFAOwXOkin0bUJ1BysXblvQAXAGmjkPykasKfy4DFOLFw0NJDsembtmk7z38QThcifSchXL0POLCnHwuesI4lBrpEPcBWqMWLSv5nQWqJy5K0hkPqxNrz2fItMwB5Sa5k9LH5Eo2quf+Y5Qd3v+aiUbS1dbXFAQzjZ7Z5amLSCrq9z701JOsO6NfcSm4QZbU2k7Bg7I1EyU7xYOsdzOwBaeqziQ== X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB1738; 31:KiMxfgSAGsdUPbIQlS0DnkYbjKUiAPENzFKnBf3wx2rByXB6+GPrfQsg2c9g6VLZi7h+qydtYeX/ifiplhGXpeIPxQjI7aSO66o7jwEfetqSF86tMWF23FesxU9EKPEjd0j/L7rkJQljRSf9dd/w9NPDiEevkxQ1q71/k2Nj3gETWNWhmJOEET+FJmcbmWGFVVgvMkaRmZ0qO5eZz+1INKF6umhtFU+hsg7AEPSWxpAghaa8Jdz/gOKmOZnKkSrJs/nwM06PGYup95PtTBVm6A==; 20:pvpMSkVCbkGSzM9oomaYZaa//Ir2qbD5I7o8rxcwVkpQ81v8mJhrPgBlm+JJLIHMSMERtpE4GXZvMSntaUKDY1s70suOxFbdFEJ64VJHpbVkedlSeWRsLBep6gIthG7RY3U3IL5FO/eqWi+MVnjtpoiFxsbnzLG6S/9NuWCriZ0p5GIDP8AOAjBZS2YGBtijnBhkneEbleR/0bqsKPF4APAV9gg2siCVXUAnqNBfeVWTQs9d4W2jehVaF41mo8X0LWV32ln8qiIF+6T5agFhfA06LHme/v0Y8I/5TlF8UC23vhmXeO1tZZ82EJvoe8Sw8PMSQSPUjUNN5Vc8Nvrjmjmxr7V3iT98ZXSoKiIaGBdeDx0vlUMUd92EwtL4eLJEjnQ+GdhplBSxO4YWJ19lNTKJp3IKy7KUxt+JOZ1fm2f6HdP0QyFRuQZXu8CoUX9mmLdCY7ij5xak1865CrhFJP1C7Lg4wStWxDcKqlTxzlPMwKX289N0QdKUZmhYPNZx8rrYiLu8KnFvO39U+Opk+PLYRYE1XXmkhGJ1/Z4IixldPqvqUbzfM06oaXj6n/USpE5ELrIOdJwhWDMNEbTXBrIljCyKuqgk5metvpQeN04= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(13016025)(13018025)(8121501046)(5005006)(10201501046)(3002001)(6055026)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(20161123558025)(6072148); SRVR:HE1PR0701MB1738; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0701MB1738; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB1738; 4:pIevWjpOui4+6beRXkB63BsWkvepIgEs8d9v4ruRwfQhuKGb+AIml6EBO5kyBdcuU7/tFRxlhlDx/GfFphWuYGK7UrqlXCQUmt2HizKkDS3Ssi7KmwLAw6K/keJPQwpuduVCak12QCZ9zEYOBNkETTOHpMdSW3ac/e+CXb3BYEeMQnozdj4lOpnToMt2zzEbQYHCz3EsgRQgQV++MXAoHCVpnSqDJU70OPskwEl10qIMpiF0qCmp8RVdGGo5Ddn9SQAghfqK3jMtErmC6dzngAs8UEXaYIR4ijBPyw5oUHcuOpdd2ANHhd5B84/l95OmLleHzF2uHWSrHp0MF3B65T2KNI5rUWF/DpMKESj3yB+Amt5XDe9QZ7M3yoV2U1A1142H/ND3I5OOstwG6ra+z43T61ymGoFs7w68SCmv2Uocor/kSdLsVGT9DcfOvfuOYeI6LfQvf21TxH1Qz0eSYN9OXC3SdgvusBUiNCAcKujgN9xqAtjf8WwD4C/Zpusw01ocwRNL+Zs0+XKh9RGWFrA7NZzAhYngegfCnRHBmOzcfPYJ07WhsbWewQ5ITE+pbCGo801ncJMTcs07wQkDFYEOfE34si43JxxxtnYg0BH4X152pAx7LX+25tZ+Q2hAzDWmfXRhIgutrPPEMmZQesNu6SNWQgInszaDPn7UJng= X-Forefront-PRVS: 02272225C5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0701MB1738; 23:H/HYbPwNGPnSlmiihXIt6CKgxdgdDP+l0Ioj+6U?= m+OJad7Jy44zcLhpYoDQOGM6JwPS34Mceiw8OwGYtaYfXPr+JdygnKfIyIp4H7PGE84x0IRw3vGkyxBiN4heGdmKUUwNuakzR6AdKdcZaBAlB9psuWOIDDbJ/qpTI/TZZHocDpe1n+G/8b9JLGkHoFEWZIIwqR5au/6EzcIGd6/rhjoitif9CGxZc8f0ZB1Vrw2e6h3Q3F/A5B+Eh2x3kfE3h4ZjmovfHBlCJFgq893cNtwnvmA8iTw8qBy2Zxt3ugfGBEHdmCS4Fitjj7A9xHvnnBUsffnAFYbbuO4hGQKG3U7ReYMlLo+zztae85TnjoV80rptkZ7GIe3ijW0YKHXRQbanXZsNu2j+juDrBnqZco+8+kp3Dr7yCdvBpFx1fz3f2SWQPRLsmyQ+G4JlrVqliuIS9eHIaedklaZuU+QdYHGipFD1chTHM/WvPzVmIaSOoN/GBiDsIPLSB8vMEBGJR2m+ERnJulYRNCtHZmgINQ/v0Xau1wgV6Omc64gG+lcHvlRqa0Ke9rk69/U9vqSKHdGzti3T3E/Poz8++l057ANHSb7bCQ8vXBNPHynTVRd3r7yE1sbTMVAF4cbO3JqahVG6JEDfCLYMfGM0ycUqjSN9jSpFqvgFtEtmpH+Ise0wu0YwFs8kS7RBGk79MOQtnUVdLLnZLnrkziAO1C9f/YwaLs0mbTFJiFJau5ngC+YhHVDVL/8Vlu3nHWpSV3UOrJ9wkeGpaPMoolR8DJuyDPLDn5gZScM1vsjAwyHGTI2P/qaEILGYBbEH4c2Pfo161YT9BJ5i4POuSfquvdonHfXSBKQibCi3uBggzy2t5LkPpUP+Nd9YanPac9fW4DLbB0YMQm6xGXyfbPsSrjfJisRCl1DpqetHZ+e8XX4s3KSXYzDp72Ro6zAzkOt+nVGssvmHwVHJ7c6Gy7qE5zm6OKT2pSPYN6Z30l+lJuK1Tly6huy7OEUG7DGEIPng4SXiq4u6q/rxsgZ9fJk0i5l4MK4arl3tFvJ99zIKhqvlPlBkOTplQGh+8csYtMrbH2jqtSncptfh6dOyjmfdbG9pYLQ== X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB1738; 6:fbE0NrZn1TvgMnJJV/n7mob9N4NmgP6SMkIf9vYjqaJpWchYqVS6bDNQDPKVEccYtLbfVVfGcV5gQhmQUvh5tdQ4tMyYR2XY7F69dIS8vv4XolJQZ0gkbT0JhpzkbSN4ESlP+R4SG8Uwf/uDHGQ5F46FL27X3Tgn1qFFSRHdSDEaZ4cOvd6IuXv/X7B1C0UfftwAZvo+uzmsLU0r/CnGBhcL2kFOZ4TUq6NJ2HuaGc1SvlJX2oQYOQXNLM5yk6R26u4ekr+x31STWLiWFl5QfVnQBblgT3I5yPkEjUNX3JIdFdo/81SfTTx7KDvQlqA06Sjx2mw9fvNp5mgRrNkjnOb2/JTIn5VtY5WfWH37xxtSaMyQOP9K1m+PNvLijceVHfYJjkq+NYRDluHcQSiSeMWp93ihCV+tOcetTNbTm4M=; 5:TpdpnuZAlo6uQvyYZOSOIOika8TYIjxr4u83KCPxXlEKFSOUz99NYSINkdkpAP0Tw2L/YBVn21zhPkQRk3ql7iio9+ShnmNLpGLHrUYNpkP65mIQAF6g+Wwhg4xM5pydVBupbo9Ymje+RnM6ySfSXA==; 24:DLhQCjcZX9P2p1ZaQHgom3J52rHdpfddrzgFnYvD029J1OJI46H9VA3U1Q92ITf9ZaGcz0S7vImbdpaqWTax5pz9sj1jWzrIoTsf2tlwmJI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB1738; 7:VKMYj7oqqJRkEPy5+epR/kgXKqUJ+fNBFQX+rV3MJRaeRZgIlfkG4/0m4s1nmqezyzA3gcFh5r0FDyu4nXlHvUVmzT/GPtheR0YSXgRGJlZQO+IJLG9ocvaopTfblbBsu2jeM+yolxatDC4Mkq8l7dNQoOrrS672lb8xFvTS1iiY15zVkyjUOT3Hea0MmQgfBUaJVllDjdFg76Xf+jbaKXKdZ6H+H572Hk2aDknqpZfzlDm0mnI38UlhrgaKyRBR7bup8fyYXtDjei80s3R4fx4oEB6o4fdMW7UtrLy2tNx8063lZ2iv8PJHIzxXKoQtsJWLRuLqn/sik0nRu9iuqw== X-OriginatorOrg: nokia.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2017 14:14:45.0259 (UTC) X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.36]; Helo=[hybrid2.ext.net.nokia.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0701MB1738 Subject: [lng-odp] [API-NEXT PATCH 1/4] api: hints: remove ODP_DEPRECATED from API X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Remove ODP_DEPRECATED macro as it depends on (GCC) compiler type attribute, which may not be supported (the same way) by all compilers. Also the attribute works only for types, but not e.g. for fields of structure. A new configuration option will be added to control deprecated definitions. Signed-off-by: Petri Savolainen --- include/odp/api/spec/hints.h | 5 ----- 1 file changed, 5 deletions(-) -- 2.8.1 diff --git a/include/odp/api/spec/hints.h b/include/odp/api/spec/hints.h index 82400f0..a763645 100644 --- a/include/odp/api/spec/hints.h +++ b/include/odp/api/spec/hints.h @@ -52,11 +52,6 @@ extern "C" { #define ODP_PRINTF_FORMAT(x, y) __attribute__((format(printf, (x), (y)))) /** - * Indicate deprecated variables, functions or types - */ -#define ODP_DEPRECATED __attribute__((__deprecated__)) - -/** * Intentionally unused variables of functions */ #define ODP_UNUSED __attribute__((__unused__)) From patchwork Thu Feb 23 14:14:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 94382 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp231377qgi; Thu, 23 Feb 2017 06:16:51 -0800 (PST) X-Received: by 10.36.200.9 with SMTP id w9mr4608432itf.113.1487859410932; Thu, 23 Feb 2017 06:16:50 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id r141si5162260itr.103.2017.02.23.06.16.50; Thu, 23 Feb 2017 06:16:50 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 6ED13609AA; Thu, 23 Feb 2017 14:16:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 7300E60A1F; Thu, 23 Feb 2017 14:15:35 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id DD14A60A1F; Thu, 23 Feb 2017 14:15:24 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0133.outbound.protection.outlook.com [104.47.0.133]) by lists.linaro.org (Postfix) with ESMTPS id 6138F60F58 for ; Thu, 23 Feb 2017 14:14:55 +0000 (UTC) Received: from DB6PR07CA0053.eurprd07.prod.outlook.com (10.175.237.143) by HE1PR07MB0825.eurprd07.prod.outlook.com (10.162.24.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.5; Thu, 23 Feb 2017 14:14:53 +0000 Received: from DB5EUR03FT022.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e0a::209) by DB6PR07CA0053.outlook.office365.com (2603:10a6:6:2a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.2 via Frontend Transport; Thu, 23 Feb 2017 14:14:53 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning linaro.org discourages use of 131.228.2.35 as permitted sender) Received: from hybrid2.ext.net.nokia.com (131.228.2.35) by DB5EUR03FT022.mail.protection.outlook.com (10.152.20.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.10 via Frontend Transport; Thu, 23 Feb 2017 14:14:52 +0000 Received: from fihe3nok1347.nsn-intra.net (10.158.36.135) by fihe3nok1346.nsn-intra.net (10.158.36.134) with Microsoft SMTP Server (TLS) id 15.1.466.34; Thu, 23 Feb 2017 16:14:51 +0200 Received: from mailrelay.int.nokia.com (10.130.128.21) by fihe3nok1347.nsn-intra.net (10.158.36.135) with Microsoft SMTP Server (TLS) id 15.1.466.34 via Frontend Transport; Thu, 23 Feb 2017 16:14:51 +0200 Received: from fihe3nok0734.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v1NEE95V029199 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Feb 2017 16:14:09 +0200 Received: from 10.144.19.15 ([10.144.104.219]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v1NEE8UD029180 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Thu, 23 Feb 2017 16:14:08 +0200 X-HPESVCS-Source-Ip: 10.144.104.219 From: Petri Savolainen To: Date: Thu, 23 Feb 2017 16:14:06 +0200 Message-ID: <1487859248-23273-2-git-send-email-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1487859248-23273-1-git-send-email-petri.savolainen@linaro.org> References: <1487859248-23273-1-git-send-email-petri.savolainen@linaro.org> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:131.228.2.35; IPV:NLI; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(7916002)(39840400002)(39450400003)(39410400002)(39860400002)(39850400002)(2980300002)(189002)(199003)(22756006)(2906002)(626004)(92566002)(2950100002)(305945005)(105596002)(8676002)(6916009)(106466001)(356003)(68736007)(5660300001)(76176999)(36756003)(86362001)(81166006)(53936002)(50986999)(81156014)(50226002)(77096006)(33646002)(38730400002)(5003940100001)(47776003)(110136004)(50466002)(48376002)(189998001)(97736004)(8936002)(450100001)(2351001)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR07MB0825; H:hybrid2.ext.net.nokia.com; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB5EUR03FT022; 1:mCaOqMfBLT8xgWU7hpeESySAtI7VWYH/HyuDXfTw3QXz7mkn/M/anIfsI/Ts1h5o2+Ig13HbUZ/ZdzkvTeI88A3TA7KNy6MFTuVnQEF8LTRNyK0Yhu6ONvDipU7Ili+sRNv+roc+NchZYeUXFViF81BFaBwwpTueEIKZU8AzaIwiDTNBiquCphXeJCbCsDfhM4t+DbIa5I121nuv0f5HkFMGLThNo9v4fDGBKj3kl3sj3G0Xy7DjPZyUdc6gedXoW5HKwlbsU3zu2EtVU+3Wm0aLtW5lFcgyMbJzjzLsxkA28uG0gQoFJeedEExDlyojf8ixEfvd3o7BSgxWIZ7TUEQv9TXY1wYEbNCBGdbGTluVEfn+dPbgxWQT7uBDOzvlO7jhbPODe9GvAjtS6FUNEfHs24pcC4oYzx6ddACTJE3QXknFIOBCAHmXcGEhmRZOYcfLoNVjwWRdDDZavaHiMQ== X-MS-Office365-Filtering-Correlation-Id: f528b42c-e4e0-41fd-d657-08d45bf6560a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:HE1PR07MB0825; X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB0825; 3:dS1uUDwRa/irfmOrsi3Od1QQOuwoLBIGikNuBfrSzJTbNqNp4Xi7zwh7UgrIQa04FGa9CVhUVxTqBiXTgo3tS7T+zw+DVFtAo6Oo/mtoDcWA7Dlpi26IdbpWe5K+RduQuR8jbaArS61ZnluNb55p8edoA+eT/4RFn8TD79jSeCXjhhPtYOZ4pEAwhDvNyGwTgb3UB/b4nXeGQNPpvJz/gsycNcj8iLKY9oEKy4M4FciTYLeglA7sHvOZBCSaNiR0P6oQTpdVfU2QwmkmfxM5tsfeLCoQNhAElgHvj9pM3BOBAfBxemMh6LvfTH0/j0RWrCA2pgxOy5M8HIXSkHd4mpCnxrTfPRtoBPGvYDPI3KHwiI5NVadcPVdBMc4wyIqM; 25:4pVkZhcYygkRBb+1ikzq2Vqg+H7bANahUEARpBYi9getDIk62nbicr7xZGUEX6BognTBrzLVZ12o78ZTyCdiaEAgick+D8Rjapj0r2v5BlmlB4cJ40hxDR3hnKU5dzRb8isb2mvJRGzKzaVtCheAmbNd/W02LB39AeIhvqPBx8flKVA83o9/lddrd9wY0vGsPVfVmaxzX5+OagjaknRPB3ilN0Vv+TX9KP3YYHrGJ9ZwNmPjpqXwyeqQbHZfiDAtGX6f33ZWExYXTBLo4+pBTgHipd92jHpjenIjGQJluMJauDkdsJjn/gI8KEUeIFnsENn7n6dvKDiBggkGu8wPTsgz6jXU8lPAQgsondauvQsx43exQnJr7zRiFxfHJHvm8mYxtbGTw/LWa9+oStaDWWHtY4UTsquQNpZgUE5SBWgBXw8Wyjy2mDGkxXWZigX37BZPw1gDXLrYcsR9uEaXag== X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB0825; 31:b3XQN7NqHtQU+HX7anvUU2sSqh/aoLFdgQwErFbzKA7yeHMIkrCdcbzumIj9d8joOfe0g2O89AeP1oJoxUrjagIOHNZE1ICprbLrmeOO+lVCZfVpjLvPzQmLWfMNj5WBh0ITIOzA7kz+UZB3LhPveVUJ8ZOz8Q1eG0iZk/TT+QKbuRoSObvM0SR9fwSCJ5Dm5Qx1GJSbLAkgyYQZ0GO8XdirkrirYapCO803PmOpTdY98w6Eb8XE6Z3Kgdfy9PiWJOAEa3+N1ku4Kgvft2uc0Q==; 20:grN7HZJLC6CuPNSjXXsclb4s4MqmOdvbpbm37WSWQgxZ0vN2Jxg43Oh2VrSKBrJsIzwDRBNiBV3/rQWNsVlJDIjN9lA5CsanzCk/k391cT/z5lxb1kUbggqjLmobE1aTDIFRoEMH8mgrqi/XlvC6eO2xSBuKI5aesG5+aMNMT8ByzXcqGrFuftihr6aNRbS/BRfmQZvGHMOqbAAPq9EVpwh6AmI5IIsireqBtoVHHzpm9PzAmPsudDSaK7eFm2Xq9JNGro8j+uKQ4cMaJO2HqearS1qbsOfumm5XL7n2ST3M+L0DVvAM1R/U063HwfNu5T3EpozJzp2N92sFeniveJ5fAv4i6tlQ0tQIdgV4YSQwkg0iuDPzSB0SI8T475IeH1wAQkXZuX/T4O6RabVAQip/F62d2et2/y/6XLJiajzG/NzGVr50ZRQL6bkWmIAOEEUkFTxT0dm8A8CuTojrdIdvyX9z8MSerCGOv/kf3seWiGUH/0GXMY0wS8d0W+Mp8Uio0WfO40R+vMeBFcOQC96TV2yfPiFjrlNXIzVJ9dvfzKsK5B/7SUljgTFl5m3FUuNZiW3XfezhZl0gjUV9xsCJ0NfpDmDdxVJqrHe73OU= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(13016025)(13018025)(10201501046)(3002001)(6055026)(6041248)(20161123560025)(20161123564025)(20161123562025)(20161123558025)(20161123555025)(6072148); SRVR:HE1PR07MB0825; BCL:0; PCL:0; RULEID:; SRVR:HE1PR07MB0825; X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB0825; 4:1+GmmijYbTzpuJMvSErYuCvmACfFtQFCQBjWTVY2aTUyIR6qYhPbnsLbUqP7/tsnh0V/asLzwYWb2WL3ciC2BzXGczu6uHp9y0mHOwF0HC1Q05SRLGlR5C0URku4zmnDaZnzGfC08fZ+Zj3VK0tihpULgFPgr/CoD28lYzHpqwKN7kOnosnrrLuahYTOHzaNmX5L1nGokpRlaT/DGtQVWuQ+dWjk5WmzyWAn0gs5g3LXLjoQBLROiJ0rNn4OBuTLI4pW7wix9KyfqvY/XTWomU8r3Xgc+xmr1f4d+QjCw8KQtfb5hWjl6ti6D1qJZbX6IznZuI+2c2MGwuBNE5xjBo+xnSHty9pg9CTNl0nJhdC1RBva/RBzySIyhdB8grALKxX/P0yIHDTKpEaiTN85LzNbyKeH93Hr2MAt4QhyUVWW73fZ5Q2MttED5+YTL1q1YlfPf7x4ImQLbGlKHxK5HcpxYKtW6ygzqvWGzeHOKaGX9NwDaT2Ijshg3pn4sq4fsE5DYmcvk2HktMG2hQA2/mykU9bqtES8YEm4A7Y31aWphgsR3pc40UJIolYqDyEpJtJGaktXGKLOaqjx5VLKTXxDAwKgbx4DAK9G8QB4taq9fTxboqqGg6LzBjh2GjCUvGTfBhXmHJjoA/JwJ/qZaMyN1SEkHojF8p7nLxTThgI= X-Forefront-PRVS: 02272225C5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR07MB0825; 23:GPmCRdY0Z6VQMf6HkCrG09hZFgX+JAePWYx5ANk4t?= OX0m8CsSyZBAp9y1W5h9PIbs0cFKoIe5BNe1MeFr9WZdSykgysU2Jfxm0jVDOGBuE6lB7p7kdozCwKXFR16IXJCx4IsMTP9eqasKG8BOPkTYAS4/2fGFj4iBI9+eiHGJp7m34t1oP6AY0dj3lMR06GihyKpBWMO3bKrzF0qTxpe64yr5B82Qzgl0FFuuTyaFVU5m4q9Wz76dnnqAvNxjG89vTH/XCdnuL5gFHDdbN078dUqxxcaamegzNyHgjZjcfwD+5JxN+oP4xnbU8etZCHCL8xxsDgf1Biui4YBq6yqaKpNnoNSaa2r1cy2OmyC6Q61qZFfZEEUxNuvoCjGS+7YgLb1FVZFaNhxpflIwwv7ugVKkxxzUpEqUi1l5Bp5WgvXv0Tr9UAqc7GNVzGMaLLtTLfxLY3bwWTP1Kb0CTqQXFcACM3SIX19AzCE+3QRqLPQg5XPuJfW6XRXQ1ylH7/0cTXU25qTrm3z+Ilp9Tm3XghRkYiNfs3FRfzMfHOjP1woEHyZDeVUq4sas9Lzq1bDsRd7VpvgT3qhJxOvWLwMRbgcPbDzzvyhi4aWkZVUOs6t+2xbIKJuw2r+UfdDc/fRMCwpyHbbCnVA8+SK9RM+uWPeSjmAsc2Mf9Vng/Ah1DTmPll79RpkMKVkwMNwO/vxZguSqA8iQLzoyWXToUvbmGQzXs2Ya7Q7o5nKFw5SUtA6GVSOT7CcCNMyBYcJAgMevplitiRmKCWjnwBBemW//bCmvHZvJoAOShccDdTkO+ILDlIAwE206U+aWXr/OIEUxr3EkHzoqX4+/BSiBwjpwVJylQgkpovHpGHu6++26gAvOwcNWXuBfoLdSWnR6F4ZzvV83aJ/EA+Xe2d7P/qNTzMeiuTu5NypbFC6kWiAAU7p1NIpWoE3f122vJtlz5d3QSb2w6LdVHfLLcgzQimBCamoK4BDF69Gv6DC0ez8MbW7kgrvTnp/DkpplSYV5lNzqRET8p5h8Q/e2IDzRRZcLw8bASuU8WxRy1VCvxzAjZWopTYKp9RGI0kTEjE0fv7v0dGKnXahf3G8ECSPiJcOZAkv+gxsz3FkLGaxa1fYsLw= X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB0825; 6:h5sScetLtRpnfORsa01PVpNXwdZFB2q+DEBWKU7y1D2LWHowqNBcmuiuLOQjZtMisSC4tcTt09GQ9sZ8tzEFMolddvLyba5kHJ08+OHcc14CzgKECDWbRFj5Kr1DT7IbDjBLUCtK+uG/mmtAvq7y7q9AcSfQuw/DfDP18k6naog0CcnPJQ3RIy0rwYZBpP1pU3l6oXmlfvLnlmoTBQigOgS3ZKw3MiugYnMhXrdG52qYDxMW4qN4vr1icvJpa06HJltOzlMApMwlvzqeJzYjpj8u61jQUDGA91mtns+Bb2vOymmJo0u6g+DKR3mIqG3RfYoKdM6Wcvf1UJ8gbE4duFK41viA7GK0n0GSrmgpCkliZ9u8PPpizbydSJ0h3IudLaCz35EWN/Gg8YYqH+Zi0SgByaCFrDQrdKWsWi9L0NU=; 5:TrmJcxKRkwW0VwZwICQvnSPKmCEdABgQHSRDaR0vlJk2iK9tAKyVI8+f8/AsTYlJT3dJonzHIxzUERdZ4j8eeDFFURgoH9RVfFvTya6VLG6hirFBx9WAlzt94r8FJNce13cA10ZAod0GWvltdiKKiA==; 24:CdKbFpv/tBtwlFmJ8C0SzS77+Zk96MNGopJZJBIzh5hT/p2B//bqj+eo0MWHyo2UtyMuTHpynp1MC5p8r6cUJHpJtXxlCgAvEw7R6E1YA7A= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB0825; 7:0L+ubK4zfoDKGubF1dSWKTreCe7X/sXX1wGzzcAbkoIPS1eSKQD3PxMniMaIhN2tlj3Nicjo3O6N3kgZ1AybmUgYyXE8kLtZ9ItLTQupmSkbDU/1vEsCr7yNb7fLGC8dATm/vGdff1jfAcUMKfvLktLPj1wjDgpHOAlOiXCBvzT0HuuHrwMdGgzu08WTXpgZnZwc4Gnob6BTMkpMQm6K8R9MlBngzf+UxWMD8QgdJ0ii18Mfhinsb4hCm42jaRSWEFZ4Sw429A1EZSY71TbAutlXOlFIvk29UUzATjocnwOsvdAJhjGF6MkMLbvXzQUyYIHEs89I4fbUVh+evfxC9Q== X-OriginatorOrg: nokia.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2017 14:14:52.8465 (UTC) X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.35]; Helo=[hybrid2.ext.net.nokia.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR07MB0825 Subject: [lng-odp] [API-NEXT PATCH 2/4] api: deprecated: add ODP_DEPRECATED configure option X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Added ODP_DEPRECATED macro which is visible through API and is used to control if deprecated API definitions are enabled or disabled. Deprecated definitions are first moved behind this macro and then removed completely in a later API version. Deprecated APIs are disabled by default. Added configuration option --enable-deprecated to control the macro value. Signed-off-by: Petri Savolainen --- configure.ac | 19 +++++++++-- include/odp/api/spec/.gitignore | 1 + include/odp/api/spec/deprecated.h.in | 38 ++++++++++++++++++++++ include/odp_api.h | 1 + platform/Makefile.inc | 1 + platform/linux-generic/Makefile.am | 1 + .../linux-generic/include/odp/api/deprecated.h | 26 +++++++++++++++ 7 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 include/odp/api/spec/deprecated.h.in create mode 100644 platform/linux-generic/include/odp/api/deprecated.h -- 2.8.1 diff --git a/configure.ac b/configure.ac index e4bd3a7..9927916 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,8 @@ ODP_VERSION_API_MAJOR=odpapi_major_version AC_SUBST(ODP_VERSION_API_MAJOR) ODP_VERSION_API_MINOR=odpapi_minor_version AC_SUBST(ODP_VERSION_API_MINOR) -AC_CONFIG_FILES([include/odp/api/spec/version.h]) +AC_CONFIG_FILES([include/odp/api/spec/version.h + include/odp/api/spec/deprecated.h]) AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects]) AC_CONFIG_SRCDIR([helper/config.h.in]) @@ -284,7 +285,7 @@ ODP_CFLAGS="$ODP_CFLAGS -DODP_DEBUG=$ODP_DEBUG" ODP_ABI_COMPAT=1 abi_compat=yes AC_ARG_ENABLE([abi-compat], - [ --disable-abi-compat disables ABI compatible mode, enables inline code in header files], + [ --disable-abi-compat disables ABI compatible mode, enables inline code in header files], [if test "x$enableval" = "xno"; then ODP_ABI_COMPAT=0 abi_compat=no @@ -294,6 +295,19 @@ AC_ARG_ENABLE([abi-compat], AC_SUBST(ODP_ABI_COMPAT) ########################################################################## +# Enable/disable deprecated API definitions +########################################################################## +ODP_DEPRECATED=0 +deprecated=no +AC_ARG_ENABLE([deprecated], + [ --enable-deprecated enable deprecated API definitions], + [if test "x$enableval" = "xyes"; then + ODP_DEPRECATED=1 + deprecated=yes + fi]) +AC_SUBST(ODP_DEPRECATED) + +########################################################################## # Default warning setup ########################################################################## ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes" @@ -379,6 +393,7 @@ AC_MSG_RESULT([ static libraries: ${enable_static} shared libraries: ${enable_shared} ABI compatible: ${abi_compat} + Deprecated APIs: ${deprecated} cunit: ${cunit_support} test_vald: ${test_vald} test_perf: ${test_perf} diff --git a/include/odp/api/spec/.gitignore b/include/odp/api/spec/.gitignore index 6702033..df9c87d 100644 --- a/include/odp/api/spec/.gitignore +++ b/include/odp/api/spec/.gitignore @@ -1 +1,2 @@ +deprecated.h version.h diff --git a/include/odp/api/spec/deprecated.h.in b/include/odp/api/spec/deprecated.h.in new file mode 100644 index 0000000..a319064 --- /dev/null +++ b/include/odp/api/spec/deprecated.h.in @@ -0,0 +1,38 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * Macro for deprecated API definitions + */ + +#ifndef ODP_API_DEPRECATED_H_ +#define ODP_API_DEPRECATED_H_ +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Deprecated API definitions + * + * Some API definitions may be deprecated by this or a previous API version. + * This macro controls if those are enabled (and visible to the application) + * or disabled. + * + * * 0: Deprecated API definitions are disabled + * * 1: Deprecated API definitions are enabled + */ +#define ODP_DEPRECATED @ODP_DEPRECATED@ + +#ifdef __cplusplus +} +#endif + +#include +#endif diff --git a/include/odp_api.h b/include/odp_api.h index 73e5309..962415f 100644 --- a/include/odp_api.h +++ b/include/odp_api.h @@ -18,6 +18,7 @@ extern "C" { #endif +#include #include #include #include diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 874cf88..f282770 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -29,6 +29,7 @@ odpapispecinclude_HEADERS = \ $(top_srcdir)/include/odp/api/spec/cpumask.h \ $(top_srcdir)/include/odp/api/spec/crypto.h \ $(top_srcdir)/include/odp/api/spec/debug.h \ + $(top_srcdir)/include/odp/api/spec/deprecated.h \ $(top_srcdir)/include/odp/api/spec/errno.h \ $(top_srcdir)/include/odp/api/spec/event.h \ $(top_srcdir)/include/odp/api/spec/hash.h \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index deab284..242c54a 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -34,6 +34,7 @@ odpapiinclude_HEADERS = \ $(srcdir)/include/odp/api/cpumask.h \ $(srcdir)/include/odp/api/crypto.h \ $(srcdir)/include/odp/api/debug.h \ + $(srcdir)/include/odp/api/deprecated.h \ $(srcdir)/include/odp/api/errno.h \ $(srcdir)/include/odp/api/event.h \ $(srcdir)/include/odp/api/hash.h \ diff --git a/platform/linux-generic/include/odp/api/deprecated.h b/platform/linux-generic/include/odp/api/deprecated.h new file mode 100644 index 0000000..82797eb --- /dev/null +++ b/platform/linux-generic/include/odp/api/deprecated.h @@ -0,0 +1,26 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * Control deprecated API definitions + */ + +#ifndef ODP_PLAT_DEPRECATED_H_ +#define ODP_PLAT_DEPRECATED_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +#ifdef __cplusplus +} +#endif + +#endif From patchwork Thu Feb 23 14:14:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 94380 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp230795qgi; Thu, 23 Feb 2017 06:15:32 -0800 (PST) X-Received: by 10.107.144.9 with SMTP id s9mr27839278iod.146.1487859332718; Thu, 23 Feb 2017 06:15:32 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id z5si4815931ita.84.2017.02.23.06.15.32; Thu, 23 Feb 2017 06:15:32 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 45B3362C7C; Thu, 23 Feb 2017 14:15:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id A6F5760A1F; Thu, 23 Feb 2017 14:15:26 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 2499E60F4C; Thu, 23 Feb 2017 14:15:23 +0000 (UTC) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0098.outbound.protection.outlook.com [104.47.1.98]) by lists.linaro.org (Postfix) with ESMTPS id 40DFF60F53 for ; Thu, 23 Feb 2017 14:14:54 +0000 (UTC) Received: from VI1PR07CA0015.eurprd07.prod.outlook.com (10.163.160.153) by VI1PR0701MB1743.eurprd07.prod.outlook.com (10.167.196.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.2; Thu, 23 Feb 2017 14:14:52 +0000 Received: from DB5EUR03FT031.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e0a::207) by VI1PR07CA0015.outlook.office365.com (2a01:111:e400:533d::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.2 via Frontend Transport; Thu, 23 Feb 2017 14:14:52 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning linaro.org discourages use of 131.228.2.35 as permitted sender) Received: from hybrid2.ext.net.nokia.com (131.228.2.35) by DB5EUR03FT031.mail.protection.outlook.com (10.152.20.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.10 via Frontend Transport; Thu, 23 Feb 2017 14:14:52 +0000 Received: from fihe3nok1348.nsn-intra.net (10.158.36.136) by fihe3nok1346.nsn-intra.net (10.158.36.134) with Microsoft SMTP Server (TLS) id 15.1.466.34; Thu, 23 Feb 2017 16:14:49 +0200 Received: from mailrelay.int.nokia.com (10.130.128.21) by fihe3nok1348.nsn-intra.net (10.158.36.136) with Microsoft SMTP Server (TLS) id 15.1.466.34 via Frontend Transport; Thu, 23 Feb 2017 16:14:49 +0200 Received: from fihe3nok0734.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v1NEE9rd029204 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Feb 2017 16:14:09 +0200 Received: from 10.144.19.15 ([10.144.104.219]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v1NEE8UE029180 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Thu, 23 Feb 2017 16:14:09 +0200 X-HPESVCS-Source-Ip: 10.144.104.219 From: Petri Savolainen To: Date: Thu, 23 Feb 2017 16:14:07 +0200 Message-ID: <1487859248-23273-3-git-send-email-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1487859248-23273-1-git-send-email-petri.savolainen@linaro.org> References: <1487859248-23273-1-git-send-email-petri.savolainen@linaro.org> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:131.228.2.35; IPV:NLI; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(7916002)(39410400002)(39840400002)(39450400003)(39860400002)(39850400002)(2980300002)(189002)(199003)(92566002)(50986999)(86362001)(356003)(81156014)(8936002)(8676002)(626004)(50226002)(76176999)(189998001)(5003940100001)(81166006)(53936002)(110136004)(38730400002)(5660300001)(450100001)(22756006)(305945005)(2950100002)(106466001)(105596002)(36756003)(97736004)(33646002)(2906002)(68736007)(77096006)(2351001)(6916009)(48376002)(50466002)(47776003)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0701MB1743; H:hybrid2.ext.net.nokia.com; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB5EUR03FT031; 1:hDi0fSrfBC6KqCWmqpJpfFTMOLA7L5yIa6CEC1BzPYBlT5jeukBhGNJd/f54gaT++VAhInrt1EAYgfUvkBytKAO6CRCUxgaJ77Q+n+tVDYuHlmeKdpwyzdyFJbnFrY93fmCHpX5Q/MsMkEiemkwb3Kosao8G6l94pHwGB4WzNNGcpOqVPdjwOmDS+ptJ88x/HdIvKHifuEBT/bqX0fHCML3ZKQ7zg5jgcZ80CciyaCe0XuLASZlpPmDcY1vr9UFRVXORQvd9ggtLy59oZboOuIgptY4SaljPFM49I2ebEr6lcG6dGMZOAZXAQD4EY4F46jFvVqbnSMrAHY1pXzDxm9pj7S+8OJlEvkmBTVVrRUHuzurgQNIRmM/Iz/JaIE/MJTGIC44VIjK2lT1AfEP6le7nLoIHx5h7cfBufKOCcztHq5Z4MuqWB6RO4+AHfWHLrzekLoliTo2wyghXnWEbuA== X-MS-Office365-Filtering-Correlation-Id: af50da4e-3a60-4ea5-0faf-08d45bf65589 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:VI1PR0701MB1743; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB1743; 3:GWZfFsXgzjGgCYrBRpIv7uBWcbqCzW8S1RaIRP/gVHudqHYLqN/UycZMGmJlsQUosnoCptFvg+50gylBB5dV/3N4LZexljr7xhSdn7+D8rX5XvTNcwRTJcCx4WH0zhBjPWv7p7nTxiEepufubf8Z9oPnjJR0ykTVba9im3oIoWC40x1okFKvPAX4xhchbzBG4nCysLL5DatBBv/LFLV2TI1iAycypxpgQHZktPcmCVKEoojvYGOWnX/Tfk2ANVYqkLx5TerJjdovN+v8gtlyAcML9k3GQBiqw+bTpCWtSqADvwuS0dqcXMGsV12UF9wuGPUUoLLXnEfWs6r2LQTcxoUh2ehxjFxVF90KwFbRGMiuwVBXvE9v/klkmshoFX2q; 25:F50h5iC7FbLHkd1dWM+IvdrV4xkqM+lkxSdnzMwPK2r/OTBG+FPs26J6m0OfgXJImcbxuiVsbaeKltiXa6lcgDaTOulel7UdtHvWNgGTrWvXFM75Ti2tIFikPD6eJPz5ciOAuHAzaH4PnAQQyucABXSOGzl5fdqXbE5NwlXzGCG/0NE+QSYIEE/Rho8xQhMmjQbhFz2MO7VhYrNI1QcXO1PQUqQpVyh8NXiTq02DD6jf9UPsKEsohVYwvTiGEf65s36wg1Mh3HXA7yMjSh4MwVXumox6M7Jug64KzI+PPJnCcNFPAthHXxwVAk2acqnF4A4RLOhvL3bgrrvKky/613x2efI5dk7i+Xf7sqPVKmU+AnG/7QxiOQhX0DHS1Of/oPcO0PnWm/Zp47M5cmeyTtJjaup2cx82vleAp5uEEfDmnfNsvFfrIcI6w/Lr22mdecyz/NeXwMNraYBsPEJ7gQ== X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB1743; 31:Qd7np5rww+E1+ER1xqLzCRMKPiH056szN4HMO/MBAhkdnroI6UuUJvttxh/jJcZXML+zbxhwQCItvbtcL8SM4WeVr30PYMme50LRwynuj1Mp2I33GoR66tKVVeUtxeLIfigKN/B1dpb3m2Dev5uPnj5W1i+lvqgAINGs8d6lgN6Ce1IwZRHIHh4W/nWEuCQNijrHafkcxuVHmjvZ57I3CXgBNkgMzv/plt9D+Hu0D0tsKhkvJvCob1WEIK/mif2R9wxlANTDuUR9KzlDNNhVWe2yOtI+Qh1O+sGrqo2eSng=; 20:y3zH9LRrK2WNjZyZdxPViY7/J6guheY8xvwQeER7L8onIuOOrxHvi52bMmc4h8gz7z/GnB0xMEE7Km/kA3ouLpWvlXS4diZqczRMxvUEVdEZXVXbo9e4fDDyV9CfS8qNsJd7ukSFsBoR5pwJIAVLe9QTNT5uVg7ZfMZ/yly3ZOftVF7l7HOHCaQ1IOCts0Rcs4+3hbxOxprFVvK1E6JrMIVoYMlrggXqvCruulUpkF6C5tjUajKxfSgVhbh9oYtQaxvCGyWGvC+7TuAMnmv3cTUGSGw3UYSXkQbqsyQM9qDbR6g1My5Bn/mALI7A9qQTGVBYwURbvUiXkYXFIWIMNPNV2F1U437iYUY55GnpHRrv4Z8GCsSDEH1qdQwoFEGo21cp9X9FJ2M+Wx81G9lQoZjKRP23lEzRQy4zLftvnxSJ3ZRHIm+NL6Kuz8sbeJQ9EbTKo8pN8V4PaNrGcyHgKP4r5kZ755XDma+1bs3Q+A2Kq/sx/KhFypg/Q4trVklMQ1aWw2aS3wdL6mBvCYoFan6RHfSLOXIPOVfSh6ryO9oLcCUnqSbxHE+YfMbpP1mo+o9kEaV6cbQucBIlrLH5hm8Cq/suIhDIPbnenv/dwTQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(13018025)(13016025)(8121501046)(5005006)(10201501046)(3002001)(6055026)(6041248)(20161123560025)(20161123562025)(20161123564025)(20161123558025)(20161123555025)(6072148); SRVR:VI1PR0701MB1743; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0701MB1743; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB1743; 4:UG9wBoQ/vDwHmCAA3LvS1y1nWYwo/hj8MgK3WazSODYbIwhoGdHkWHQOczqxHdsSFWtrXdFDoabFeQLqT1Obn+6Td1B+sIKWY4aONtRM6V9/Yc8k4l7uUFJzO3uqHF4GslqUa/2OP0YTRcvBKV4NQUmAUFer9CUo2Awi8Z3gDvovOmPN78yB1qGkfomWffAgrEzXh3nMUKb82ufZ8kP5s2L71xMSMJ8GHXK4HaRSlvQ1KadiNPnXV3wJjAaxYYJBq51NT6g/p7kMI4CApFSSH3Z00K0FmzzaZXLdjhkz/hFPEjH0dDxl+dOuiGSq2562zBCX87Hhc5IAAJjbA2aqC/Ea6l09crq2L2ISn//Mbo6I7jVuWWrnkLK2lfsQ8hcRfpRFCeixBSPRHBpWSAgDkg0jhEN6EzSWPNxgd6tIbNWApaaq4/8DH4bmWtEIZd+Xtk2uiMJQLQWn8e+CWSNn5ahnhoPzoMEHu1ayGMchHU7UIYbu1rmD4Ps/ObvnpRwrbrlY3eC4vKt6ShayV7ZSS0TGnytM5Fig2dnwgH7+yWcal9fHWzwYOHubc11A/pVIYOjPNIwFgZ/H/ztVoI6Gm3bYnuYPRelwS48AeSkhT4yYt/O7fwMah/4E0NNEQ89DDiNqvV6XBlwVqoMoPwe/rOOxD2fFRUPoi9KWyKZYLvk= X-Forefront-PRVS: 02272225C5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0701MB1743; 23:0jS2ZTnT+c/0l/v+ieAe+iqtPCd1zVp0A3CJI1W?= FH4wJJ1m5oL82ub9z4fQ8+zBunJx8Pxxx14PEhR6R9solSdEDI20HysLhlqVTr64Dic9j3IYF4ExX5nMBVsHT/C2DsN+l0J3Q4C1rKVvLG65PdOntfJcSW76ia2bea525X0hJZakicfHmsTlykQYDNlUQhB5O72lfkEWrKpg/UkqC6oyXAjJcMgU8itObA+jyz6yUxci1UmmHpgi5CZaDJzpEpPkGWDpS4EsAfteN3ohs2ce7d/3I2+MXqMHaXtrUGx8brpP0MFLRFVNRJsk0D4PkEmkyMowCRvTSP7GgXBQcu3wIPviDzXnWZh00WpYI9rr/tHQU71tmxjD2I/lxtEsCMq9o2uQzvzhekeW89RB/FmKX42YIc3JUO/bKA3/tryg7vY05AziFyZWY+kSTP56v+ocnYcOAP3O0jMru3D3rQIzk+iHsbZwleXMG9wBS53+42yB148O6Y7pa0OMPMiKefiStytGs+MoObEHl4HuLVIPdeb4i7PL8bmwYbhTscU1QFzUoH5slIKH6bxv7zmJ+P1xlLbiBAHDcWWDsNnh7Zsol2ozIgfO9LJKl7ReW3a3Em1xmDGyjFqaTVa+iahMF9cq5tAMSKvPft9FgBTSnuUnmhaDFoqw3CvrHqq0zaoTiuZjtjKKXjp71JPvSQ5rWQBEgIHG2rLAy6sRm9vA9PD6k1oT8FL0fbk66qWx+N6jWxVvKtOTIBuNiqG9hzAzWquq2So8ClL1TnkyQbzDfk+NG4ZCFuYyqnuvIvEFhrdSue2AKeFDNYZ9knfGHqzslxTr6ebH3qbhah/dI0w0l7s1rzGDrUYMpd4CJ6fzH6Xq96L1bViHZxO2HFJwy6xi5g6hwqq0AyFsFvSYZD4ArUWM1P7xtgBAA0koIjMY18tKn4K/HS5lc1fQiT6u3Gw2H3d00zwIGg+P37zXaida0WgSUC1GxnV2vuIHz8YeQU/rzGdAzsJBNWtC9PclTNpFJqTkVj9xvlHGXDAwjo6XWCfE9o8rDnHCPwrak0EQVWITPRoiFX+EKsCWRGyUMr1+KpgbdnntdZ6F730x9HokJeqlDARCgVja6NjD/va8fk1c= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB1743; 6:Ok+EB5oY3RayC8zOybySkH4H+xjCW8kLI5RIaEZkOrX+ZeRJVFWSOpsLt1FTXfwTS8fhF8ODctTmT3cip4ek06lyc0J+HdRcJ8AXYDUH6OPTTI3nsXQ/ArNmGbuTPfpDcQRLybSSykQCSx7i/VOq0cmaGUaSy3+dHJqlSXUhw104gI/YKZo3e4FyHA8KNZi9zA8KX7eD2eO8uaCRk8ZIgB8hybZiFiakJPJPupd0aNt4GmVO9JR4h+XwJHow74cFYrQBHjoZprSj69VlFQQ6IXv5wjDAP4n7BXx7dMCRpfTv1P66DqxWjf68Pc5yC+kMYE8b6m58zfG1zW0P1Hqf9iBnQGI+AM91y0LM9EO0UHC9Wx7JJY97VvY/nA3i8ciWShoozKHF4ItmuWzcy7RfEVwRSvPEtKlxlcatwmSlS44=; 5:HgqClSRueXQRaoTot3nK24EFvvM1cptstwAinQaMRlY8Bxokj+aCTJ9Upzy1hb7OkfRHrH0CzKQ5KesqZJAlpJHIY0tJoZ/VsKxZlAKr+tnGWv65pEEos/GGBrAeubydrGKtei1bC6nf9oVPMBUMbQ==; 24:Ibi2dCh6sz08Ku3q4b3KZy9JE9gQ+K8awhc1aA/QdNbFzi+LimRQpbGHuix0nPafxqkaTnrizECYWBS9R2l6av2VKrmxOp5CR1YWC0fid8s= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB1743; 7:h0Hov0CIvHzd2JmU52EMIFDjlh/InZZum0r7qcu61vE0ufJl1A+5lzfefRZSCRCzdTucHCWykfage3PHlXO1kXKjMSp6MrCedwojdSxbB1wdffNi5eWaNZO9LCdOUS1RE3VUg5FON6uOec5iD4FxXjb0BW+aomZYhOYiBlMFSFJsVKw8cKW/PKrYoK5UU7WJ5hqQFpI31ruOINmzJdUIYFW4mr9nVcy8uLfsvA1pd2T+LnuHyUeFL+sIc0Ik386oKaqHp7vyOJMR8BU/Yk9gv2qzKpTKe+B+SAOf8cEYF9V08fMI7oKcc/39CuUt2A8rap5Kbk91fEuF/PFLsgRB7A== X-OriginatorOrg: nokia.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2017 14:14:52.0273 (UTC) X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.35]; Helo=[hybrid2.ext.net.nokia.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0701MB1743 Subject: [lng-odp] [API-NEXT PATCH 3/4] test: crypto: remove references to deprecated crypto apis X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Remove last remaining references to deprecated API definitions. Signed-off-by: Petri Savolainen --- example/ipsec/odp_ipsec_misc.h | 4 ++-- example/ipsec/odp_ipsec_sa_db.c | 4 ++-- example/ipsec/odp_ipsec_stream.c | 6 +++--- test/common_plat/performance/odp_crypto.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) -- 2.8.1 diff --git a/example/ipsec/odp_ipsec_misc.h b/example/ipsec/odp_ipsec_misc.h index e0320eb..45cb022 100644 --- a/example/ipsec/odp_ipsec_misc.h +++ b/example/ipsec/odp_ipsec_misc.h @@ -98,10 +98,10 @@ int parse_key_string(char *keystring, key->length = key_bits_in / 8; } else { - if ((alg->u.auth == ODP_AUTH_ALG_MD5_96) && + if ((alg->u.auth == ODP_AUTH_ALG_MD5_HMAC) && (KEY_BITS_MD5_96 == key_bits_in)) key->length = key_bits_in / 8; - else if ((alg->u.auth == ODP_AUTH_ALG_SHA256_128) && + else if ((alg->u.auth == ODP_AUTH_ALG_SHA256_HMAC) && (KEY_BITS_SHA256_128 == key_bits_in)) key->length = key_bits_in / 8; } diff --git a/example/ipsec/odp_ipsec_sa_db.c b/example/ipsec/odp_ipsec_sa_db.c index 28215b5..10bbcb8 100644 --- a/example/ipsec/odp_ipsec_sa_db.c +++ b/example/ipsec/odp_ipsec_sa_db.c @@ -111,11 +111,11 @@ int create_sa_db_entry(char *input, odp_bool_t cipher) } else { if (0 == strcmp(token, "md5")) { entry->alg.u.auth = - ODP_AUTH_ALG_MD5_96; + ODP_AUTH_ALG_MD5_HMAC; entry->icv_len = 12; } else if (!strcmp(token, "sha256")) { entry->alg.u.auth = - ODP_AUTH_ALG_SHA256_128; + ODP_AUTH_ALG_SHA256_HMAC; entry->icv_len = 16; } else { entry->alg.u.auth = ODP_AUTH_ALG_NULL; diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec/odp_ipsec_stream.c index 428ec04..15087cb 100644 --- a/example/ipsec/odp_ipsec_stream.c +++ b/example/ipsec/odp_ipsec_stream.c @@ -227,8 +227,8 @@ odp_packet_t create_ipv4_packet(stream_db_entry_t *stream, /* AH (if specified) */ if (entry && (entry == stream->input.entry) && (ODP_AUTH_ALG_NULL != entry->ah.alg)) { - if (entry->ah.alg != ODP_AUTH_ALG_MD5_96 && - entry->ah.alg != ODP_AUTH_ALG_SHA256_128) + if (entry->ah.alg != ODP_AUTH_ALG_MD5_HMAC && + entry->ah.alg != ODP_AUTH_ALG_SHA256_HMAC) abort(); ah = (odph_ahhdr_t *)data; @@ -424,7 +424,7 @@ odp_bool_t verify_ipv4_packet(stream_db_entry_t *stream, return FALSE; if (odp_be_to_cpu_32(ah->spi) != entry->ah.spi) return FALSE; - if (ODP_AUTH_ALG_MD5_96 != entry->ah.alg) + if (ODP_AUTH_ALG_MD5_HMAC != entry->ah.alg) abort(); } else { if (entry && (ODP_AUTH_ALG_NULL != entry->ah.alg)) diff --git a/test/common_plat/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c index 954bdb7..b385797 100644 --- a/test/common_plat/performance/odp_crypto.c +++ b/test/common_plat/performance/odp_crypto.c @@ -205,7 +205,7 @@ static crypto_alg_config_t algs_config[] = { .data = test_iv, .length = 8, }, - .auth_alg = ODP_AUTH_ALG_MD5_96, + .auth_alg = ODP_AUTH_ALG_MD5_HMAC, .auth_key = { .data = test_key16, .length = sizeof(test_key16) @@ -217,7 +217,7 @@ static crypto_alg_config_t algs_config[] = { .name = "null-hmac-md5-96", .session = { .cipher_alg = ODP_CIPHER_ALG_NULL, - .auth_alg = ODP_AUTH_ALG_MD5_96, + .auth_alg = ODP_AUTH_ALG_MD5_HMAC, .auth_key = { .data = test_key16, .length = sizeof(test_key16) From patchwork Thu Feb 23 14:14:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 94381 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp231056qgi; Thu, 23 Feb 2017 06:16:08 -0800 (PST) X-Received: by 10.107.15.196 with SMTP id 65mr29412537iop.141.1487859368027; Thu, 23 Feb 2017 06:16:08 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id i203si4817510ioa.209.2017.02.23.06.16.07; Thu, 23 Feb 2017 06:16:08 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 79B51607A7; Thu, 23 Feb 2017 14:16:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 1135A60F53; Thu, 23 Feb 2017 14:15:29 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id CD2E460EAA; Thu, 23 Feb 2017 14:15:23 +0000 (UTC) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0139.outbound.protection.outlook.com [104.47.1.139]) by lists.linaro.org (Postfix) with ESMTPS id F378C60937 for ; Thu, 23 Feb 2017 14:14:54 +0000 (UTC) Received: from VI1PR0701CA0038.eurprd07.prod.outlook.com (10.173.77.24) by HE1PR0701MB2923.eurprd07.prod.outlook.com (10.168.92.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.7; Thu, 23 Feb 2017 14:14:52 +0000 Received: from DB5EUR03FT033.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e0a::206) by VI1PR0701CA0038.outlook.office365.com (2603:10a6:800:90::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.2 via Frontend Transport; Thu, 23 Feb 2017 14:14:52 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning linaro.org discourages use of 131.228.2.35 as permitted sender) Received: from hybrid2.ext.net.nokia.com (131.228.2.35) by DB5EUR03FT033.mail.protection.outlook.com (10.152.20.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.10 via Frontend Transport; Thu, 23 Feb 2017 14:14:52 +0000 Received: from fihe3nok1348.nsn-intra.net (10.158.36.136) by fihe3nok1346.nsn-intra.net (10.158.36.134) with Microsoft SMTP Server (TLS) id 15.1.466.34; Thu, 23 Feb 2017 16:14:50 +0200 Received: from mailrelay.int.nokia.com (10.130.128.21) by fihe3nok1348.nsn-intra.net (10.158.36.136) with Microsoft SMTP Server (TLS) id 15.1.466.34 via Frontend Transport; Thu, 23 Feb 2017 16:14:50 +0200 Received: from fihe3nok0734.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v1NEE9bV029212 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Feb 2017 16:14:09 +0200 Received: from 10.144.19.15 ([10.144.104.219]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v1NEE8UF029180 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Thu, 23 Feb 2017 16:14:09 +0200 X-HPESVCS-Source-Ip: 10.144.104.219 From: Petri Savolainen To: Date: Thu, 23 Feb 2017 16:14:08 +0200 Message-ID: <1487859248-23273-4-git-send-email-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1487859248-23273-1-git-send-email-petri.savolainen@linaro.org> References: <1487859248-23273-1-git-send-email-petri.savolainen@linaro.org> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:131.228.2.35; IPV:NLI; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(7916002)(39850400002)(39410400002)(39450400003)(39840400002)(39860400002)(2980300002)(189002)(199003)(5003940100001)(36756003)(22756006)(76176999)(33646002)(575784001)(86362001)(450100001)(2906002)(47776003)(189998001)(50986999)(305945005)(97736004)(2351001)(106466001)(105596002)(50466002)(626004)(77096006)(92566002)(2950100002)(48376002)(81156014)(8676002)(68736007)(6916009)(81166006)(38730400002)(110136004)(8936002)(53936002)(50226002)(5660300001)(356003)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0701MB2923; H:hybrid2.ext.net.nokia.com; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB5EUR03FT033; 1:7IDovQ+UCAzCB5DY2Y4rdvxWSu0hByhcUU1VUulu6AesaupkZ2LvvIorpWsSeIR6OaA4CUiaGqWtFPTULHrOeSEw1fs7QZyy9ofGONQV+5rndlFouI1QciDrNvRwP9P+hqsKPAPQZ2FhCMtpaBYR+/6QP8Z/0UeemSs96D2VW/M90szblUH0JlVMmbg1B0XHJdZJT9drAmTWzSPmnUIyTjfXkSshq8KveQYs/mDl84FYAU/nr43qDr7LT/drwHvQflIG9AVYCdu8Dw6qkH40Ld5uXH19ph63LX9oP3xtIlqKvAkLmjA8lGN4O7OeCPaKfwdQyoeDxU+2Ltub6A8jfMErRFMJWHBOt1rMYr7mINd2QMSf5+J8CU1tNaj8kOtlSoSJU8SeQi3WW/jDujNasoUH5FUl2WvjtboErOzwW01/zGdIiAtFQHYcGZK0AskkKR7F5ZfqSsL+NUSGBpqfSA== X-MS-Office365-Filtering-Correlation-Id: db2e7137-d9b5-481e-993c-08d45bf655c0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:HE1PR0701MB2923; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB2923; 3:VfV6T05Rnv0oqCy8pr/vka8G9NgAkgYbvJi+xiDJvm3RU3QbWUJhwPNVVqWWotIbJPbgfQJjEkMmEck7roCdvAIOPPEaDziY3BYCHyRNL0X3l7JGXToO63lT1bhVMh6Yclx+qa9c3VssuEa33kzh7uQxX/NrGEqYr29oaP6uvP0rh7ZBFFvld5uZjh3BdS1RjyqbUr8TYalKLAnzTPmsrUBHPwRkXNeH+nMw1XF2ibUu4uVfhzUrOhroqeF1//yFIq1/waNYMfyyLCP2ndidUijqfSwAddrmYxvxtjKXuiZvxZ8cokP9TbeliCYqzVmDI4RZvm10zjxm5+E/RbcPxzKVoG83HgfgoS4NJJzhJblcekJWjDSQPqY/pQ6mX282; 25:Fq8NXFLprCN0QL6MIdz1Bmk0144OkoCA24fL48T3VR6eAkdW72pAaaD4T8X8evX5FESZLVRxwSIECvFTI1R7OJwyGOWDu2ZlGDJFLDD7WxBKklFxvXIKdgER2ac4ktge03kIyyTnwSQmXCb4TtdVhllHL3srMkXPOhc1AhGaUFqaGfNaujcFmNcVTfEZF1DtTU5w21pOORf7EYk7W+Z4KwzgH/cCEPuCjBBRa+wk7bofiEk5t7NGICUx7oLnzm0tCDmplw7GkJuzP1xqNi1/ILkjPGLflWJz+Y8I2GLPaOoPOP15Su1HoOQhUxhzhfnzn1ZHnThiiBsulBOXypJOsmyIcodAWddYyBX1uEiZaa9xTgUwa68j8dUwAPQUtjZXpKVmFokZzIJrJb8Ogd307RKhPulfY//dnYp6xwdGH+XbPltU/VMl6ivZOvjfo9OlSk7FR11McDAOHRe+3+tFkg== X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB2923; 31:wq1P8ib+ew8nySDg+638gH5X+qL0rMVzWP5E1Awy+YQeGas9mh/BUUF+PJtfq/bqDHpz01xM+6Co5ei/OshtWFFieyrDjPlqrLBJ3SiQRo4/yUi0cUbHLu9EIRggGrzsDyrih1hQYI1kQ9uaUprzND2ayde9a3ZuF7jvC7qAUe6snFHG9bOhuss//7A1cIgtFXZz2DljDGhB/buVomjuuFw6nICDbLWD7EpMHuJPLlQbQ2iwHu5HgYeZqGdQsWcxyBCzbcQ2TVd7RmQQipurhA==; 20:sAZxcdtKQeNgeix0HetIFspGRF7MtdzN5oerB6vZR9msNNoLR0A3mzyiuiGxIOddc8ymyAd56b7aK8IRjHkYGbIw1XkIvp0DeS9Pvt8HE9W75jn8ApmTCF66kbFW6rWH+8zlpo+EbkgBgSrJHVn/0Hda5Wl9pWzdqNZy+BX0eRyfGSrgqy2HwuUEtoaQ3asIgz+toUElnljiDIwge0kcsYCThJO2OeF47SVK7BB4dvUq0TS6YwTQ3X22VGi8Suhwomfr1AP38RB4X13UApRt/UtCbp9YhdfTrNV6mgRxYQBw2KGFEE2SppfBf0Qe5suI3H0xOWryCqvIkOOoUcn/IJa6kmsCZ/uaLIT1RMWIdB3HA/hjrI1Y7PnIwpclxqBughAuWZxsvmNO2eh/SDyg965ZiqvIQw/+T62kFqmRcGhtJq13f5vLb1B/3Hz/dxW71/N9mZxvslIHMEJgZOjHxM6ax+yVe/7Z+C6kH7mGrtL4lLHLoN393jMIZ18CcEGEkOWWuEo39BlrrZvItoGRriDeOrdraE1fyX+n8xzn1BDIfhWxmWE2qgnQeEGfe1kJpStO4tyiCFOnBJaTgCfgzFgwMQpU8hkNsyDK/xl3CJQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(13016025)(13018025)(8121501046)(5005006)(10201501046)(3002001)(6055026)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(20161123558025)(6072148); SRVR:HE1PR0701MB2923; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0701MB2923; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB2923; 4:qpsQATNNeY5C10j3W77eXZy91fGhwSsf7goQJZaQ+jOS67zY6e9ynHTncfDXBr/pZAhmRfYmhAX9oYDw9AtQ3peGCB12WXcFRRSo3mUaS30dr5y0gBSCUBGS/+MAE6Inn8Dl+UEq5H3i2oiWBnV5X2IjajjDyyVd/voiUyU7n+ft3C085RUQ4/ynZsXrIxtBetoK1M3OxH9CL0aC+vwJfVgVvMSmkr02eHDY8YKKMYrfMxlIOFxsS8OZi70kQZ+qLh/9N7m4msMy/0UZ2cxZyfKg+aIoNcqFaHpTFYosDd46WPrs+IGQiRPOTZirpmAnKGFUr7FMEyQZD3tB7xVI8fGFc/Na2tms0F8ACN7ioL7fZxtH82gCAJl8xMAc3chy/RnmaRCJA05J/2+wjPuHfdNJGO/qVOPnDQKZv8oKGkNVyLJDs284eQJTGSMuLLewXwMHD0s9BYpsKtpyifaePGAUx5g5ZK/BfgYGPtjdWLzKVl5zxSPX1Y3eQWai9urOfPjybB4UyaKAT7vPAYu3mRD3jp1NQc+AHsumavBBlIVFcjNxqbZmIDoXXawVnmKc+MBJlwlXvUFN6DhJ3fIwoWhkFWDBdGGfjy7QKifuUBiWwqdsa6uTRNbb4jLWWyj3nFOKjCk8uahJySV4ihnZtJcLZnrNAdsMt5UX7SvCoj4= X-Forefront-PRVS: 02272225C5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0701MB2923; 23:LtEFn4DetjI23RI3K+0cnP+KxnAuJghXcJNqJB7?= HudaofHTndnOjmvNN3CZCJO5DXyfO2tO0vlWE8r3OLW3BrQo/g4CSXHor4TKXhueTvy4zcjDGByV0gcJVrry424RGPPxOUlsR27X+eVTA37VkVK3D2a+1rxvLmYrwf3TNr1flNvWiltrMnNoVBRH603SubgvmHmQzKAtHIr3euN2EN39AkhcpHsBniiSvsSBgoZQBV2JZdDiKnDAFBtFe+e0lsIQqvJ/wli6SWxIU8y6B+mza8njn4HSEyk9gKE8/8s1yeS2nL/WnXebBJeZvamgusJZOCcCV+RlNkwTwE8N7jUzoRnfWyqRsmz/dIA6SRejUKLl60FEShdQlyjU1yp1sr20DymS1Gmb19sY30o7539NEkdM9JqJvLUnreP8uIw9Wm7kRZZ82fKlbVZCc1Vl4qfiVR7c5elSO/KPiBhFhuYCtB3DZOODOM5zsEgklJszarD8Zcy46TdBIiq+oPT6WI4vKpZg6eX+D1z2SgLLCEu+pnHTj3smF+uNIuXH31A8WxIfapjePO/xAx3qZrk+GYIkl5Ie5+69eAUKPTHrlCcLcJ3XUaWEkAwNZFK/CCV7He0rtuNLHinZl7y9Z5aZ8QqqC774sWW5/cHUTwUT8H4+c2rlgvnNRsctfgDN5ongZ0FFC6+4ipiLHqNxxb2IEasZB0wj6lUZ0Jk+c3E2l0dVeBYwXw0fPMOjrCQBKsVd3aiNYP/9P31TZio+2X8Uy+wxlY7dc625jAoMcmkgK9MuEcUMSbhN3g7/ZrND6Rg8AvOByZn6pvRivrmUttQMU+n2UeuKjPRwo3yG+AwhPjSmQG6IVvVETphUzUkSo9OLVCJgnGAba7Smqfjz/gTvekiyFWObm83mB9PoH4HwYv7W3XqoGbX5RtrvJg3WGTOvuqyEQCG70JG9ard+/mzbmdRIBCvxpVyKURn5A1YFXO1vNgWmYh22Jfh1wXjEN2/4UJQOIndJVE1ktbzOjZ6aBSLhLBYmVFJHWwy1tamHl8WQJqXCKHcotgRQE7WESNtwze5wDpWjWk1xPAOOMlHvHU7lSCxTI4lZJuv8NaTVgrKXf20+lTn4CRNiMhDIsSu9a7WPMOx8ubVxkZ1AP2q0x X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB2923; 6:I2RjHIPm+tNyeW8z4Lch074VzURwLuyTgDl6OdXuhj8eBMrzBxBZjRREG4UKoA8h55CY6pq25UvIQ0ZKMnayaqCNXrVGB7JdH5acvrLunA90fVFv3o2Saz3GJDmi/r9NmZLL9/QFNYA98cZcQkyRVtGpPqoWjtBseTkT5xcVr/aCmcRTAsPKykt9iVmx+7A7/oNxguIS1pQZHaOfJH2rJafIlMj3qW5hq7HXiHy3gNL3kcYpEn2LXyQtzKkO/cy0n3UCRbZDcjd5jLQv9fobNoCBBLYvXhu6b+nqBAwpofFMy7aQjf36hH1LVFDpz5dWBLTji47FsP83hyLZ81dWfNYx4AmiOXBq0/a4Rh4gnFMj8IO+ypcfR+aq2+8Fts66wYYJCUgv7pSHlBDfdVQZ5PoeS+j8GONw0soHvJLsR8I=; 5:4kW9Gsz9nqLO/RJqjD5dF9VkLhUvg3o+nCL6zGpWery+efz1X59lUI5ON+glvw+kUWZgminEMBjp7wgeR9BdJR3lMMlXdnyRwnJTIktu2CFBbkltoSZE0hk6OeJRDNDLEx1dM1WZwxPch85GA2iimw==; 24:6WeBXdH8wsJPGpYTLkrAypuBf9OAj864kjnRl2SNZlZBrFeC8NGpnFVQnSHCWlR2FcYmwXn02gzSWuDMkkQS1+fGtDsvf9XP9thvc9XdHx4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB2923; 7:/7d0f5x979ogYgp2FYVw91XDvD0eVdBTpA/T6Xex3ovxovK1sZnH0vlkde8o6Ic6+D0vKtIvXPpyoebr//hMnSwzt/bV9n3Fyb+CVZQEuExNiYk2Cq46LmIQPjLC4ZPjkRSpl+hLhNtVuUq7DJviIi9YCg4EwonfeUzB8etVXYqJ5JKJeO5oY17FAa1GesFKQOkdvSIMiDM9PXRmJ//Pkrq0LQYVu1tGmIuzGkw0TxA5YYnvdMKrEL42nl0kAwBphgiMOpoxBYd+xvBCBf30QWVa5NoJcjBlHDHAPHFuvLRQXxmLOF+mJseBTo7a3XMp6Soz+A7egAtTZB0JYbKvQw== X-OriginatorOrg: nokia.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2017 14:14:52.3756 (UTC) X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.35]; Helo=[hybrid2.ext.net.nokia.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0701MB2923 Subject: [lng-odp] [API-NEXT PATCH 4/4] api: crypto: enforce deprecated API status X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Used ODP_DEPRECATED to control if deprecated API definitions are visible in the API or not. Signed-off-by: Petri Savolainen --- include/odp/api/spec/crypto.h | 16 +++++++++++-- platform/linux-generic/odp_crypto.c | 45 +++++++++++++++++++++++++------------ 2 files changed, 45 insertions(+), 16 deletions(-) -- 2.8.1 diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 9855bf9..bba1c08 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -15,6 +15,8 @@ #define ODP_API_CRYPTO_H_ #include +#include + #ifdef __cplusplus extern "C" { #endif @@ -81,11 +83,13 @@ typedef enum { */ ODP_CIPHER_ALG_AES_GCM, +#if ODP_DEPRECATED /** @deprecated Use ODP_CIPHER_ALG_AES_CBC instead */ ODP_CIPHER_ALG_AES128_CBC, /** @deprecated Use ODP_CIPHER_ALG_AES_GCM instead */ ODP_CIPHER_ALG_AES128_GCM +#endif } odp_cipher_alg_t; @@ -114,6 +118,7 @@ typedef enum { */ ODP_AUTH_ALG_AES_GCM, +#if ODP_DEPRECATED /** @deprecated Use ODP_AUTH_ALG_MD5_HMAC instead */ ODP_AUTH_ALG_MD5_96, @@ -122,6 +127,7 @@ typedef enum { /** @deprecated Use ODP_AUTH_ALG_AES_GCM instead */ ODP_AUTH_ALG_AES128_GCM +#endif } odp_auth_alg_t; /** @@ -144,12 +150,13 @@ typedef union odp_crypto_cipher_algos_t { /** ODP_CIPHER_ALG_AES_GCM */ uint32_t aes_gcm : 1; - +#if ODP_DEPRECATED /** @deprecated Use aes_cbc instead */ uint32_t aes128_cbc : 1; /** @deprecated Use aes_gcm instead */ uint32_t aes128_gcm : 1; +#endif } bit; /** All bits of the bit field structure @@ -176,7 +183,7 @@ typedef union odp_crypto_auth_algos_t { /** ODP_AUTH_ALG_AES_GCM */ uint32_t aes_gcm : 1; - +#if ODP_DEPRECATED /** @deprecated Use md5_hmac instead */ uint32_t md5_96 : 1; @@ -185,6 +192,7 @@ typedef union odp_crypto_auth_algos_t { /** @deprecated Use aes_gcm instead */ uint32_t aes128_gcm : 1; +#endif } bit; /** All bits of the bit field structure @@ -298,8 +306,10 @@ typedef struct odp_crypto_session_param_t { } odp_crypto_session_param_t; +#if ODP_DEPRECATED /** @deprecated Use odp_crypto_session_param_t instead */ typedef odp_crypto_session_param_t odp_crypto_session_params_t; +#endif /** * Crypto API per packet operation parameters @@ -354,8 +364,10 @@ typedef struct odp_crypto_op_param_t { } odp_crypto_op_param_t; +#if ODP_DEPRECATED /** @deprecated Use odp_crypto_op_param_t instead */ typedef odp_crypto_op_param_t odp_crypto_op_params_t; +#endif /** * Crypto API session creation return code diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index b53b0fc..de03e7e 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -642,12 +642,13 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) capa->auths.bit.sha256_hmac = 1; capa->auths.bit.aes_gcm = 1; - /* Deprecated */ +#if ODP_DEPRECATED capa->ciphers.bit.aes128_cbc = 1; capa->ciphers.bit.aes128_gcm = 1; capa->auths.bit.md5_96 = 1; capa->auths.bit.sha256_128 = 1; capa->auths.bit.aes128_gcm = 1; +#endif capa->max_sessions = MAX_SESSIONS; @@ -738,6 +739,7 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, { int rc; odp_crypto_generic_session_t *session; + int aes_gcm = 0; /* Default to successful result */ *status = ODP_CRYPTO_SES_CREATE_ERR_NONE; @@ -780,17 +782,21 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, rc = process_des_param(session); break; case ODP_CIPHER_ALG_AES_CBC: - /* deprecated */ +#if ODP_DEPRECATED case ODP_CIPHER_ALG_AES128_CBC: +#endif rc = process_aes_param(session); break; - case ODP_CIPHER_ALG_AES_GCM: - /* deprecated */ +#if ODP_DEPRECATED case ODP_CIPHER_ALG_AES128_GCM: + if (param->auth_alg == ODP_AUTH_ALG_AES128_GCM) + aes_gcm = 1; + /* Fallthrough */ +#endif + case ODP_CIPHER_ALG_AES_GCM: /* AES-GCM requires to do both auth and * cipher at the same time */ - if (param->auth_alg == ODP_AUTH_ALG_AES_GCM || - param->auth_alg == ODP_AUTH_ALG_AES128_GCM) + if (param->auth_alg == ODP_AUTH_ALG_AES_GCM || aes_gcm) rc = process_aes_gcm_param(session); else rc = -1; @@ -805,6 +811,8 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, return -1; } + aes_gcm = 0; + /* Process based on auth */ switch (param->auth_alg) { case ODP_AUTH_ALG_NULL: @@ -812,22 +820,27 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, rc = 0; break; case ODP_AUTH_ALG_MD5_HMAC: - /* deprecated */ +#if ODP_DEPRECATED case ODP_AUTH_ALG_MD5_96: +#endif rc = process_md5_param(session, 96); break; case ODP_AUTH_ALG_SHA256_HMAC: - /* deprecated */ +#if ODP_DEPRECATED case ODP_AUTH_ALG_SHA256_128: +#endif rc = process_sha256_param(session, 128); break; - case ODP_AUTH_ALG_AES_GCM: - /* deprecated */ +#if ODP_DEPRECATED case ODP_AUTH_ALG_AES128_GCM: + if (param->cipher_alg == ODP_CIPHER_ALG_AES128_GCM) + aes_gcm = 1; + /* Fallthrough */ +#endif + case ODP_AUTH_ALG_AES_GCM: /* AES-GCM requires to do both auth and * cipher at the same time */ - if (param->cipher_alg == ODP_CIPHER_ALG_AES_GCM || - param->cipher_alg == ODP_CIPHER_ALG_AES128_GCM) { + if (param->cipher_alg == ODP_CIPHER_ALG_AES_GCM || aes_gcm) { session->auth.func = null_crypto_routine; rc = 0; } else { @@ -852,10 +865,14 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, int odp_crypto_session_destroy(odp_crypto_session_t session) { odp_crypto_generic_session_t *generic; + int aes_gcm = 0; generic = (odp_crypto_generic_session_t *)(intptr_t)session; - if (generic->p.cipher_alg == ODP_CIPHER_ALG_AES128_GCM || - generic->p.cipher_alg == ODP_CIPHER_ALG_AES_GCM) +#if ODP_DEPRECATED + if (generic->p.cipher_alg == ODP_CIPHER_ALG_AES128_GCM) + aes_gcm = 1; +#endif + if (generic->p.cipher_alg == ODP_CIPHER_ALG_AES_GCM || aes_gcm) EVP_CIPHER_CTX_free(generic->cipher.data.aes_gcm.ctx); memset(generic, 0, sizeof(*generic)); free_session(generic);