Attachment 1454843 Details for Bug 1534772 – patch to fix AlgorithmIdentifier properly

[patch] patch to fix AlgorithmIdentifier properly

0001-Ticket-12-AlgorithmIdentifier-decode-encode-process-.patch (text/plain), 1.81 KB, created by Christina Fu on 2018-06-27 01:13:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christina Fu

Created: 2018-06-27 01:13:35 UTC

Size: 1.81 KB

patch

obsolete

>From 8fc2c37b3a7af8df7da0365c23f0553febb36905 Mon Sep 17 00:00:00 2001
>From: Christina Fu <cfu@redhat.com>
>Date: Tue, 26 Jun 2018 17:59:28 -0700
>Subject: [PATCH] Ticket 12 AlgorithmIdentifier decode/encode process alters
> original data
>
>This patch provides fix to ensure that the encoding and decoding of an AlgorithmIdentifier
>structure would not alter the data.
>
>credit: original fix suggestion provided by david.k.stutzman2.ctr@mail.mil
>
>fixes https://pagure.io/jss/issue/12
>---
> org/mozilla/jss/pkix/primitive/AlgorithmIdentifier.java | 13 +------------
> 1 file changed, 1 insertion(+), 12 deletions(-)
>
>diff --git a/org/mozilla/jss/pkix/primitive/AlgorithmIdentifier.java b/org/mozilla/jss/pkix/primitive/AlgorithmIdentifier.java
>index 0662f76e..3487707f 100644
>--- a/org/mozilla/jss/pkix/primitive/AlgorithmIdentifier.java
>+++ b/org/mozilla/jss/pkix/primitive/AlgorithmIdentifier.java
>@@ -103,19 +103,8 @@ public static class Template implements ASN1Template {
>         Assert._assert( seq.size() == 2 );
> 
>         OBJECT_IDENTIFIER algOID = (OBJECT_IDENTIFIER)seq.elementAt(0);
>-        boolean allowParams = true;
>-        try {
>-            if (algOID.equals(SignatureAlgorithm.ECSignatureWithSHA256Digest.toOID()) ||
>-                algOID.equals(SignatureAlgorithm.ECSignatureWithSHA384Digest.toOID()) ||
>-                algOID.equals(SignatureAlgorithm.ECSignatureWithSHA512Digest.toOID())) {
>-                allowParams = false;
>-            }
>-        } catch (NoSuchAlgorithmException e) {
>-            // System.out.println("JSS: AlgorithmIdentifier:decode: " + e.toString());
>-            // unlikely to happen; swallow it. treat it as allowParams;
>-        }
> 
>-        if (!allowParams) {
>+        if (seq.elementAt(1) == null) {
>             return new AlgorithmIdentifier(
>                 algOID  // OID
>             );
>-- 
>2.14.3
>

Flags:

jmagne: review+

Actions: View | Diff

Attachments on bug 1534772: 1454843