Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4C8A7200B29 for ; Thu, 30 Jun 2016 21:09:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4B246160A63; Thu, 30 Jun 2016 19:09:27 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 87090160A06 for ; Thu, 30 Jun 2016 21:09:26 +0200 (CEST) Received: (qmail 86479 invoked by uid 500); 30 Jun 2016 19:09:25 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 86469 invoked by uid 99); 30 Jun 2016 19:09:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jun 2016 19:09:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5D40DE00DB; Thu, 30 Jun 2016 19:09:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sebb@apache.org To: commits@commons.apache.org Date: Thu, 30 Jun 2016 19:09:26 -0000 Message-Id: <52194d3a2de54ba1baf85fd890ff75a4@git.apache.org> In-Reply-To: <0da0a1a53f8e44048246ab1df330f494@git.apache.org> References: <0da0a1a53f8e44048246ab1df330f494@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] commons-crypto git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-crypto.git archived-at: Thu, 30 Jun 2016 19:09:27 -0000 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-crypto.git Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/cc3a0651 Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/cc3a0651 Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/cc3a0651 Branch: refs/heads/master Commit: cc3a0651d614807d77ef00f6110b6c1e96fca2b3 Parents: 907b4d2 2e3939f Author: Sebb Authored: Thu Jun 30 20:08:58 2016 +0100 Committer: Sebb Committed: Thu Jun 30 20:09:21 2016 +0100 ---------------------------------------------------------------------- .../commons/crypto/jna/OpenSslJnaCipher.java | 28 +++++++++----------- .../crypto/jna/OpenSslJnaCryptoRandom.java | 4 +-- 2 files changed, 15 insertions(+), 17 deletions(-) ----------------------------------------------------------------------