Attachment 1441303 Details for Bug 1577991 – Proposed patch to fix issue.

[patch] Proposed patch to fix issue.

1577991.patch (text/plain), 4.23 KB, created by Jack Magne on 2018-05-24 23:10:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jack Magne

Created: 2018-05-24 23:10:39 UTC

Size: 4.23 KB

patch

obsolete

>21a22
>> import java.util.Arrays;
>67c68
><         components = new int[componentLen];
>---
>>         components = new long[componentLen];
>74c75
><             components[i++] = Integer.valueOf(comp).intValue();
>---
>>             components[i++] = Long.valueOf(comp).longValue();
>78c79
><         components[i] = Integer.valueOf(comp).intValue();
>---
>>         components[i] = Long.valueOf(comp).longValue();
>86a88,103
>>             long[] longValues = Arrays.stream(values)
>>                         .mapToLong((i) -> (long) i)
>>                         .toArray();
>>             components = longValues.clone();
>>             componentLen = values.length;
>>         } catch (Throwable t) {
>>             System.out.println("X509.ObjectIdentifier(), no cloning!");
>>         }
>>     }
>> 
>>     /**
>>      * Constructs an object ID from an array of longs This
>>      * is used to construct constant object IDs.
>>      */
>>     public ObjectIdentifier(long values[]) {
>>         try {
>93a111
>> 
>153c171
><         int component;
>---
>>         long component;
>156c174
><         for (components = new int[allocationQuantum], componentLen = 0; in.available() > bufferEnd;) {
>---
>>         for (components = new long[allocationQuantum], componentLen = 0; in.available() > bufferEnd;) {
>160c178
><                 int X, Y;
>---
>>                 long X, Y;
>192c210
><                     int tmp_components[];
>---
>>                     long tmp_components[];
>194c212
><                     tmp_components = new int[components.length
>---
>>                     tmp_components = new long[components.length
>221c239,242
><         bytes.write((components[0] * 40) + components[1]);
>---
>>         /* We can use the int here because we know we are dealing
>>            with small numbers for the first byte
>>         */
>>         bytes.write((int) ((components[0] * 40) + components[1]));
>237c258
><     private static int getComponent(DerInputStream in)
>---
>>     private static long getComponent(DerInputStream in)
>239c260,261
><         int retval, i, tmp;
>---
>>         long retval;
>>         int i, tmp;
>241c263
><         for (i = 0, retval = 0; i < 4; i++) {
>---
>>         for (i = 0, retval = 0; i < 8; i++) {
>257c279
><     private static void putComponent(DerOutputStream out, int val)
>---
>>     private static void putComponent(DerOutputStream out, long val)
>260c282
><         byte buf[] = new byte[4];
>---
>>         byte buf[] = new byte[8];
>262c284
><         for (i = 0; i < 4; i++) {
>---
>>         for (i = 0; i < 8; i++) {
>362c384
><      * larger than 32 bits.  Then we represent the path from the root as
>---
>>      * larger than 64 bits.  Then we represent the path from the root as
>365c387
><     private int components[]; // path from root
>---
>>     private long components[]; // path from root
>425a448,490
>>     }
>> 
>>     public static void main(String[] args) {
>> 
>>         long[] oid_components_long = { 1L, 3L,6L,1L,4L,1L,2312L,9L,1L,1L,1526913300628L, 1L};
>>         int[] oid_components_int =  { 1, 3,6,1,4,1,2312,9,1,1,15269, 1, 1};
>> 
>>         String oidIn = "1.3.6.1.4.1.2312.9.1.1526913300628.1";
>>         ObjectIdentifier oid = new ObjectIdentifier(oidIn);
>> 
>>         ObjectIdentifier fromDer = null;
>>         ObjectIdentifier fromStaticMethod = null;
>>         ObjectIdentifier fromComponentList = null;
>>         ObjectIdentifier  fromComponentListInt = null;
>> 
>>         System.out.println("oid: " + oid.toString());
>> 
>>         DerOutputStream out = new DerOutputStream();
>> 
>>         try {
>>             oid.encode(out);
>>             DerInputStream  in = new DerInputStream(out.toByteArray());
>>             fromDer = new ObjectIdentifier(in);
>> 
>>             System.out.println("fromDer: " + fromDer.toString());
>> 
>>             fromStaticMethod = ObjectIdentifier.getObjectIdentifier(oidIn);
>> 
>>             System.out.println("fromStaticMethod: " + fromStaticMethod.toString());
>> 
>>             fromComponentList = new ObjectIdentifier(oid_components_long);
>> 
>>             System.out.println("fromComponentList: " + fromComponentList.toString());
>> 
>>             fromComponentListInt = new ObjectIdentifier(oid_components_int);
>> 
>>             System.out.println("fromComponentListInt: " + fromComponentListInt);
>> 
>>         } catch (IOException e) {
>>             e.printStackTrace();
>>         }
>> 
>>

Actions: View | Diff

Attachments on bug 1577991: 1439642 | 1441303 | 1447663