From patchwork Tue Apr 26 21:06:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 733551 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3QL7Kox002105 for ; Tue, 26 Apr 2011 21:07:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758193Ab1DZVHT (ORCPT ); Tue, 26 Apr 2011 17:07:19 -0400 Received: from sentry-three.sandia.gov ([132.175.109.17]:57503 "EHLO sentry-three.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757623Ab1DZVHS (ORCPT ); Tue, 26 Apr 2011 17:07:18 -0400 X-WSS-ID: 0LKA2O3-0C-8VZ-02 X-M-MSG: Received: from interceptor1.sandia.gov (interceptor1.sandia.gov [132.175.109.5]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by sentry-three.sandia.gov (Postfix) with ESMTP id 179784E8AF4 for ; Tue, 26 Apr 2011 15:07:07 -0600 (MDT) Received: from sentry.sandia.gov (mm03snlnto.sandia.gov [132.175.109.20]) by interceptor1.sandia.gov (RSA Interceptor) for ; Tue, 26 Apr 2011 15:02:30 -0600 Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.2)); Tue, 26 Apr 2011 15:06:34 -0600 X-Server-Uuid: 6BFC7783-7E22-49B4-B610-66D6BE496C0E Received: from localhost.localdomain (skynetcore1.sandia.gov [134.253.138.22]) by mailgate.sandia.gov (8.14.4/8.14.4) with ESMTP id p3QL6Gr1016412; Tue, 26 Apr 2011 15:06:16 -0600 From: "Jim Schutt" To: ceph-devel@vger.kernel.org cc: "Jim Schutt" Subject: [PATCH] auth: Avoid const mismatch when calling nss_aes_operation() Date: Tue, 26 Apr 2011 15:06:13 -0600 Message-ID: <1303851974-29838-1-git-send-email-jaschut@sandia.gov> X-Mailer: git-send-email 1.6.6 X-PMX-Version: 5.6.0.2009776, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.4.26.205419 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_LESS 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, BODY_SIZE_800_899 0, DATE_TZ_NA 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_PATH 0, __URI_NO_WWW 0, __URI_NS ' X-TMWD-Spam-Summary: TS=20110426210649; ID=1; SEV=2.3.1; DFV=B2011042620; IFV=NA; AIF=B2011042620; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230352E34444237333345382E303035383A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2011042620_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 61A9EC502K42262781-01-01 X-RSA-Inspected: yes X-RSA-Classifications: public X-RSA-Action: allow Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 26 Apr 2011 21:07:20 +0000 (UTC) Signed-off-by: Jim Schutt --- src/auth/Crypto.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/auth/Crypto.cc b/src/auth/Crypto.cc index 3dbfd88..757ed79 100644 --- a/src/auth/Crypto.cc +++ b/src/auth/Crypto.cc @@ -101,7 +101,7 @@ decrypt(const bufferptr& secret, const bufferlist& in, bufferlist& out) const # define AES_KEY_LEN 16 # define AES_BLOCK_LEN 16 -static int nss_aes_operation(CK_ATTRIBUTE_TYPE op, bufferptr& secret, const bufferlist& in, bufferlist& out) { +static int nss_aes_operation(CK_ATTRIBUTE_TYPE op, const bufferptr& secret, const bufferlist& in, bufferlist& out) { const CK_MECHANISM_TYPE mechanism = CKM_AES_CBC_PAD; // sample source said this has to be at least size of input + 8,