Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 74692 invoked from network); 8 Nov 2006 12:21:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Nov 2006 12:21:51 -0000 Received: (qmail 20091 invoked by uid 500); 8 Nov 2006 12:22:02 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 20071 invoked by uid 500); 8 Nov 2006 12:22:01 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 20060 invoked by uid 99); 8 Nov 2006 12:22:01 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Nov 2006 04:22:01 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Nov 2006 04:21:49 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 9A9E51A984D; Wed, 8 Nov 2006 04:21:22 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r472466 - in /incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/pkcs7: ContentInfo.java SignedData.java Date: Wed, 08 Nov 2006 12:21:22 -0000 To: harmony-commits@incubator.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061108122122.9A9E51A984D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tellison Date: Wed Nov 8 04:21:21 2006 New Revision: 472466 URL: http://svn.apache.org/viewvc?view=rev&rev=472466 Log: Apply patch HARMONY-209 ([classlib][security] Add getters to org.apache.harmony.security.pkcs7 classes.) Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/pkcs7/ContentInfo.java incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/pkcs7/SignedData.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/pkcs7/ContentInfo.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/pkcs7/ContentInfo.java?view=diff&rev=472466&r1=472465&r2=472466 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/pkcs7/ContentInfo.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/pkcs7/ContentInfo.java Wed Nov 8 04:21:21 2006 @@ -74,6 +74,14 @@ return null; } + public Object getContent() { + return content; + } + + public int[] getContentType() { + return oid; + } + public byte[] getEncoded() { if (encoding == null) { encoding = ASN1.encode(this); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/pkcs7/SignedData.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/pkcs7/SignedData.java?view=diff&rev=472466&r1=472465&r2=472466 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/pkcs7/SignedData.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/apache/harmony/security/pkcs7/SignedData.java Wed Nov 8 04:21:21 2006 @@ -83,6 +83,27 @@ return signerInfos; } + /** + * @return Returns the contentInfo. + */ + public ContentInfo getContentInfo() { + return contentInfo; + } + + /** + * @return Returns the digestAlgorithms. + */ + public List getDigestAlgorithms() { + return digestAlgorithms; + } + + /** + * @return Returns the version. + */ + public int getVersion() { + return version; + } + public String toString() { StringBuffer res = new StringBuffer(); res.append("---- SignedData:"); //$NON-NLS-1$