-
Notifications
You must be signed in to change notification settings - Fork 23
/
android.patch
13110 lines (12747 loc) · 479 KB
/
android.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -Naur bcprov-jdk16-145.orig/org/bouncycastle/asn1/ASN1Collection.java bcprov-jdk16-145/org/bouncycastle/asn1/ASN1Collection.java
--- bcprov-jdk16-145.orig/org/bouncycastle/asn1/ASN1Collection.java 1970-01-01 00:00:00.000000000 +0000
+++ bcprov-jdk16-145/org/bouncycastle/asn1/ASN1Collection.java 2011-09-03 18:19:15.000000000 +0000
@@ -0,0 +1,298 @@
+package org.bouncycastle.asn1;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.ConcurrentModificationException;
+
+// BEGIN android-note
+/*
+ * This is a new class that was synthesized from ASN1Sequence and
+ * ASN1Set, but with extra smarts about efficiently storing its
+ * elements.
+ */
+// END android-note
+
+/**
+ * Base class for collection-like <code>DERObject</code>s. Instances
+ * of this class will keep up to four elements directly, resorting to
+ * an external collection only if more elements than that need to be
+ * stored.
+ */
+public abstract class ASN1Collection
+ extends ASN1Object
+{
+ /** >= 0; size of the collection */
+ private int size;
+
+ /** null-ok; element #0 */
+ private DEREncodable obj0;
+
+ /** null-ok; element #1 */
+ private DEREncodable obj1;
+
+ /** null-ok; element #2 */
+ private DEREncodable obj2;
+
+ /** null-ok; element #3 */
+ private DEREncodable obj3;
+
+ /** null-ok; elements #4 and higher */
+ private DEREncodable[] rest;
+
+ /**
+ * Returns the object at the postion indicated by index.
+ *
+ * @param index the index (starting at zero) of the object
+ * @return the object at the postion indicated by index
+ */
+ public DEREncodable getObjectAt(int index) {
+ if ((index < 0) || (index >= size)) {
+ throw new IndexOutOfBoundsException(Integer.toString(index));
+ }
+
+ switch (index) {
+ case 0: return obj0;
+ case 1: return obj1;
+ case 2: return obj2;
+ case 3: return obj3;
+ default: return rest[index - 4];
+ }
+ }
+
+ /**
+ * Returns the number of objects in this instance.
+ *
+ * @return the number of objects in this instance
+ */
+ public int size() {
+ return size;
+ }
+
+ /** {@inheritDoc} */
+ public final int hashCode() {
+ Enumeration e = this.getObjects();
+ int hashCode = 0;
+
+ while (e.hasMoreElements()) {
+ Object o = e.nextElement();
+
+ if (o != null) {
+ hashCode ^= o.hashCode();
+ }
+ }
+
+ return hashCode;
+ }
+
+ /**
+ * Adds a new element to this instance.
+ *
+ * @param obj non-null; the instance to add
+ */
+ protected void addObject(DEREncodable obj) {
+ if (obj == null) {
+ throw new NullPointerException("obj == null");
+ }
+
+ int sz = size;
+
+ switch (sz) {
+ case 0: obj0 = obj; break;
+ case 1: obj1 = obj; break;
+ case 2: obj2 = obj; break;
+ case 3: obj3 = obj; break;
+ case 4: {
+ // Initial allocation of rest.
+ rest = new DEREncodable[5];
+ rest[0] = obj;
+ break;
+ }
+ default: {
+ int index = sz - 4;
+ if (index >= rest.length) {
+ // Grow rest.
+ DEREncodable[] newRest = new DEREncodable[index * 2 + 10];
+ System.arraycopy(rest, 0, newRest, 0, rest.length);
+ rest = newRest;
+ }
+ rest[index] = obj;
+ break;
+ }
+ }
+
+ size++;
+ }
+
+ /**
+ * Sets the element at a given index (used by {@link #sort}).
+ *
+ * @param obj non-null; the object to set
+ * @param index >= 0; the index
+ */
+ private void setObjectAt(DEREncodable obj, int index) {
+ switch (index) {
+ case 0: obj0 = obj; break;
+ case 1: obj1 = obj; break;
+ case 2: obj2 = obj; break;
+ case 3: obj3 = obj; break;
+ default: {
+ rest[index - 4] = obj;
+ break;
+ }
+ }
+ }
+
+ /**
+ * Encodes this instance to the given stream.
+ *
+ * @param out non-null; stream to encode to
+ */
+ /*package*/ abstract void encode(DEROutputStream out) throws IOException;
+
+ /**
+ * Gets an enumeration of all the objects in this collection.
+ *
+ * @return non-null; the enumeration
+ */
+ public Enumeration getObjects() {
+ return new ASN1CollectionEnumeration();
+ }
+
+ /**
+ * Associated enumeration class.
+ */
+ private class ASN1CollectionEnumeration implements Enumeration {
+ /** original size; used for modification detection */
+ private final int origSize = size;
+
+ /** >= 0; current cursor */
+ private int at = 0;
+
+ /** {@inheritDoc} */
+ public boolean hasMoreElements() {
+ if (size != origSize) {
+ throw new ConcurrentModificationException();
+ }
+
+ return at < origSize;
+ }
+
+ /** {@inheritDoc} */
+ public Object nextElement() {
+ if (size != origSize) {
+ throw new ConcurrentModificationException();
+ }
+
+ switch (at++) {
+ case 0: return obj0;
+ case 1: return obj1;
+ case 2: return obj2;
+ case 3: return obj3;
+ default: return rest[at - 5];
+ }
+ }
+ }
+
+ /**
+ * Sorts the elements in this instance.
+ */
+ protected void sort() {
+ if (size <= 1) {
+ return;
+ }
+
+ boolean swapped = true;
+
+ // TODO: This is bubble sort. Probably not the best choice.
+ while (swapped) {
+ int index = 0;
+ byte[] a = getEncoded(getObjectAt(0));
+
+ swapped = false;
+
+ while (index != size - 1) {
+ int nextIndex = index + 1;
+ byte[] b = getEncoded(getObjectAt(nextIndex));
+
+ if (lessThanOrEqual(a, b)) {
+ a = b;
+ } else {
+ DEREncodable o = getObjectAt(index);
+
+ setObjectAt(getObjectAt(nextIndex), index);
+ setObjectAt(o, nextIndex);
+
+ swapped = true;
+ }
+
+ index++;
+ }
+ }
+ }
+
+ /**
+ * Returns true if a <= b (arrays are assumed padded with zeros).
+ */
+ private static boolean lessThanOrEqual(byte[] a, byte[] b) {
+ if (a.length <= b.length) {
+ for (int i = 0; i != a.length; i++) {
+ int l = a[i] & 0xff;
+ int r = b[i] & 0xff;
+
+ if (r > l) {
+ return true;
+ } else if (l > r) {
+ return false;
+ }
+ }
+
+ return true;
+ } else {
+ for (int i = 0; i != b.length; i++) {
+ int l = a[i] & 0xff;
+ int r = b[i] & 0xff;
+
+ if (r > l) {
+ return true;
+ } else if (l > r) {
+ return false;
+ }
+ }
+
+ return false;
+ }
+ }
+
+ /**
+ * Gets the encoded form of an object.
+ *
+ * @param obj non-null; object to encode
+ * @return non-null; the encoded form
+ */
+ private static byte[] getEncoded(DEREncodable obj) {
+ ByteArrayOutputStream bOut = new ByteArrayOutputStream();
+ ASN1OutputStream aOut = new ASN1OutputStream(bOut);
+
+ try {
+ aOut.writeObject(obj);
+ } catch (IOException e) {
+ throw new IllegalArgumentException(
+ "cannot encode object added to collection");
+ }
+
+ return bOut.toByteArray();
+ }
+
+ /** {@inheritDoc} */
+ public final String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append('[');
+ for (int i = 0; i < size; i++) {
+ if (i != 0) sb.append(", ");
+ sb.append(getObjectAt(i));
+ }
+ sb.append(']');
+ return sb.toString();
+ }
+}
diff -Naur bcprov-jdk16-145.orig/org/bouncycastle/asn1/ASN1InputStream.java bcprov-jdk16-145/org/bouncycastle/asn1/ASN1InputStream.java
--- bcprov-jdk16-145.orig/org/bouncycastle/asn1/ASN1InputStream.java 2010-01-11 21:46:14.000000000 +0000
+++ bcprov-jdk16-145/org/bouncycastle/asn1/ASN1InputStream.java 2011-09-03 18:19:15.000000000 +0000
@@ -348,7 +348,9 @@
case BMP_STRING:
return new DERBMPString(bytes);
case BOOLEAN:
- return new DERBoolean(bytes);
+ // BEGIN android-changed
+ return DERBoolean.getInstance(bytes);
+ // END android-changed
case ENUMERATED:
return new DEREnumerated(bytes);
case GENERALIZED_TIME:
diff -Naur bcprov-jdk16-145.orig/org/bouncycastle/asn1/ASN1Null.java bcprov-jdk16-145/org/bouncycastle/asn1/ASN1Null.java
--- bcprov-jdk16-145.orig/org/bouncycastle/asn1/ASN1Null.java 2010-01-11 21:46:14.000000000 +0000
+++ bcprov-jdk16-145/org/bouncycastle/asn1/ASN1Null.java 2011-09-03 18:19:15.000000000 +0000
@@ -8,9 +8,11 @@
public abstract class ASN1Null
extends ASN1Object
{
- public ASN1Null()
+ // BEGIN android-changed
+ /*package*/ ASN1Null()
{
}
+ // END android-changed
public int hashCode()
{
diff -Naur bcprov-jdk16-145.orig/org/bouncycastle/asn1/ASN1Sequence.java bcprov-jdk16-145/org/bouncycastle/asn1/ASN1Sequence.java
--- bcprov-jdk16-145.orig/org/bouncycastle/asn1/ASN1Sequence.java 2010-01-11 21:46:14.000000000 +0000
+++ bcprov-jdk16-145/org/bouncycastle/asn1/ASN1Sequence.java 2011-09-03 18:19:15.000000000 +0000
@@ -2,12 +2,20 @@
import java.io.IOException;
import java.util.Enumeration;
-import java.util.Vector;
+// BEGIN android-removed
+// import java.util.Vector;
+// END android-removed
+
+// BEGIN android-note
+// Changed inheritence of class.
+// END android-note
public abstract class ASN1Sequence
- extends ASN1Object
+ extends ASN1Collection
{
- private Vector seq = new Vector();
+ // BEGIN android-removed
+ // private Vector seq = new Vector();
+ // END android-removed
/**
* return an ASN1Sequence from the given object.
@@ -85,10 +93,12 @@
throw new IllegalArgumentException("unknown object in getInstance: " + obj.getClass().getName());
}
- public Enumeration getObjects()
- {
- return seq.elements();
- }
+ // BEGIN android-removed
+ // public Enumeration getObjects()
+ // {
+ // return seq.elements();
+ // }
+ // END android-removed
public ASN1SequenceParser parser()
{
@@ -127,45 +137,47 @@
};
}
- /**
- * return the object at the sequence position indicated by index.
- *
- * @param index the sequence number (starting at zero) of the object
- * @return the object at the sequence position indicated by index.
- */
- public DEREncodable getObjectAt(
- int index)
- {
- return (DEREncodable)seq.elementAt(index);
- }
-
- /**
- * return the number of objects in this sequence.
- *
- * @return the number of objects in this sequence.
- */
- public int size()
- {
- return seq.size();
- }
-
- public int hashCode()
- {
- Enumeration e = this.getObjects();
- int hashCode = size();
-
- while (e.hasMoreElements())
- {
- Object o = e.nextElement();
- hashCode *= 17;
- if (o != null)
- {
- hashCode ^= o.hashCode();
- }
- }
-
- return hashCode;
- }
+ // BEGIN android-removed
+ // /**
+ // * return the object at the sequence position indicated by index.
+ // *
+ // * @param index the sequence number (starting at zero) of the object
+ // * @return the object at the sequence position indicated by index.
+ // */
+ // public DEREncodable getObjectAt(
+ // int index)
+ // {
+ // return (DEREncodable)seq.elementAt(index);
+ // }
+ //
+ // /**
+ // * return the number of objects in this sequence.
+ // *
+ // * @return the number of objects in this sequence.
+ // */
+ // public int size()
+ // {
+ // return seq.size();
+ // }
+ //
+ // public int hashCode()
+ // {
+ // Enumeration e = this.getObjects();
+ // int hashCode = size();
+ //
+ // while (e.hasMoreElements())
+ // {
+ // Object o = e.nextElement();
+ // hashCode *= 17;
+ // if (o != null)
+ // {
+ // hashCode ^= o.hashCode();
+ // }
+ // }
+ //
+ // return hashCode;
+ // }
+ // END android-removed
boolean asn1Equals(
DERObject o)
@@ -201,17 +213,19 @@
return true;
}
- protected void addObject(
- DEREncodable obj)
- {
- seq.addElement(obj);
- }
-
- abstract void encode(DEROutputStream out)
- throws IOException;
-
- public String toString()
- {
- return seq.toString();
- }
+ // BEGIN android-removed
+ //protected void addObject(
+ // DEREncodable obj)
+ //{
+ // seq.addElement(obj);
+ //}
+
+ //abstract void encode(DEROutputStream out)
+ // throws IOException;
+
+ //public String toString()
+ //{
+ // return seq.toString();
+ //}
+ // END android-removed
}
diff -Naur bcprov-jdk16-145.orig/org/bouncycastle/asn1/ASN1Set.java bcprov-jdk16-145/org/bouncycastle/asn1/ASN1Set.java
--- bcprov-jdk16-145.orig/org/bouncycastle/asn1/ASN1Set.java 2010-01-11 21:46:14.000000000 +0000
+++ bcprov-jdk16-145/org/bouncycastle/asn1/ASN1Set.java 2011-09-03 18:19:15.000000000 +0000
@@ -3,12 +3,20 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Enumeration;
-import java.util.Vector;
+// BEGIN android-removed
+// import java.util.Vector;
+// END android-removed
+
+// BEGIN android-note
+// Changed inheritence of class.
+// END android-note
abstract public class ASN1Set
- extends ASN1Object
+ extends ASN1Collection
{
- protected Vector set = new Vector();
+ // BEGIN android-removed
+ // protected Vector set = new Vector();
+ // END android-removed
/**
* return an ASN1Set from the given object.
@@ -104,32 +112,34 @@
{
}
- public Enumeration getObjects()
- {
- return set.elements();
- }
-
- /**
- * return the object at the set position indicated by index.
- *
- * @param index the set number (starting at zero) of the object
- * @return the object at the set position indicated by index.
- */
- public DEREncodable getObjectAt(
- int index)
- {
- return (DEREncodable)set.elementAt(index);
- }
-
- /**
- * return the number of objects in this set.
- *
- * @return the number of objects in this set.
- */
- public int size()
- {
- return set.size();
- }
+ // BEGIN android-removed
+ // public Enumeration getObjects()
+ // {
+ // return set.elements();
+ // }
+ //
+ // /**
+ // * return the object at the set position indicated by index.
+ // *
+ // * @param index the set number (starting at zero) of the object
+ // * @return the object at the set position indicated by index.
+ // */
+ // public DEREncodable getObjectAt(
+ // int index)
+ // {
+ // return (DEREncodable)set.elementAt(index);
+ // }
+ //
+ // /**
+ // * return the number of objects in this set.
+ // *
+ // * @return the number of objects in this set.
+ // */
+ // public int size()
+ // {
+ // return set.size();
+ // }
+ // END android-removed
public ASN1SetParser parser()
{
@@ -168,23 +178,25 @@
};
}
- public int hashCode()
- {
- Enumeration e = this.getObjects();
- int hashCode = size();
-
- while (e.hasMoreElements())
- {
- Object o = e.nextElement();
- hashCode *= 17;
- if (o != null)
- {
- hashCode ^= o.hashCode();
- }
- }
-
- return hashCode;
- }
+ // BEGIN android-removed
+ // public int hashCode()
+ // {
+ // Enumeration e = this.getObjects();
+ // int hashCode = size();
+ //
+ // while (e.hasMoreElements())
+ // {
+ // Object o = e.nextElement();
+ // hashCode *= 17;
+ // if (o != null)
+ // {
+ // hashCode ^= o.hashCode();
+ // }
+ // }
+ //
+ // return hashCode;
+ // }
+ // END android-removed
boolean asn1Equals(
DERObject o)
@@ -220,52 +232,54 @@
return true;
}
- /**
- * return true if a <= b (arrays are assumed padded with zeros).
- */
- private boolean lessThanOrEqual(
- byte[] a,
- byte[] b)
- {
- if (a.length <= b.length)
- {
- for (int i = 0; i != a.length; i++)
- {
- int l = a[i] & 0xff;
- int r = b[i] & 0xff;
-
- if (r > l)
- {
- return true;
- }
- else if (l > r)
- {
- return false;
- }
- }
-
- return true;
- }
- else
- {
- for (int i = 0; i != b.length; i++)
- {
- int l = a[i] & 0xff;
- int r = b[i] & 0xff;
-
- if (r > l)
- {
- return true;
- }
- else if (l > r)
- {
- return false;
- }
- }
-
- return false;
- }
- }
+ // BEGIN android-removed
+ // /**
+ // * return true if a <= b (arrays are assumed padded with zeros).
+ // */
+ // private boolean lessThanOrEqual(
+ // byte[] a,
+ // byte[] b)
+ // {
+ // if (a.length <= b.length)
+ // {
+ // for (int i = 0; i != a.length; i++)
+ // {
+ // int l = a[i] & 0xff;
+ // int r = b[i] & 0xff;
+ //
+ // if (r > l)
+ // {
+ // return true;
+ // }
+ // else if (l > r)
+ // {
+ // return false;
+ // }
+ // }
+ //
+ // return true;
+ // }
+ // else
+ // {
+ // for (int i = 0; i != b.length; i++)
+ // {
+ // int l = a[i] & 0xff;
+ // int r = b[i] & 0xff;
+ //
+ // if (r > l)
+ // {
+ // return true;
+ // }
+ // else if (l > r)
+ // {
+ // return false;
+ // }
+ // }
+ //
+ // return false;
+ // }
+ // }
+ // END android-removed
private byte[] getEncoded(
DEREncodable obj)
@@ -285,59 +299,61 @@
return bOut.toByteArray();
}
- protected void sort()
- {
- if (set.size() > 1)
- {
- boolean swapped = true;
- int lastSwap = set.size() - 1;
-
- while (swapped)
- {
- int index = 0;
- int swapIndex = 0;
- byte[] a = getEncoded((DEREncodable)set.elementAt(0));
-
- swapped = false;
-
- while (index != lastSwap)
- {
- byte[] b = getEncoded((DEREncodable)set.elementAt(index + 1));
-
- if (lessThanOrEqual(a, b))
- {
- a = b;
- }
- else
- {
- Object o = set.elementAt(index);
-
- set.setElementAt(set.elementAt(index + 1), index);
- set.setElementAt(o, index + 1);
-
- swapped = true;
- swapIndex = index;
- }
-
- index++;
- }
-
- lastSwap = swapIndex;
- }
- }
- }
-
- protected void addObject(
- DEREncodable obj)
- {
- set.addElement(obj);
- }
-
- abstract void encode(DEROutputStream out)
- throws IOException;
-
- public String toString()
- {
- return set.toString();
- }
+ // BEGIN android-removed
+ // protected void sort()
+ // {
+ // if (set.size() > 1)
+ // {
+ // boolean swapped = true;
+ // int lastSwap = set.size() - 1;
+ //
+ // while (swapped)
+ // {
+ // int index = 0;
+ // int swapIndex = 0;
+ // byte[] a = getEncoded((DEREncodable)set.elementAt(0));
+ //
+ // swapped = false;
+ //
+ // while (index != lastSwap)
+ // {
+ // byte[] b = getEncoded((DEREncodable)set.elementAt(index + 1));
+ //
+ // if (lessThanOrEqual(a, b))
+ // {
+ // a = b;
+ // }
+ // else
+ // {
+ // Object o = set.elementAt(index);
+ //
+ // set.setElementAt(set.elementAt(index + 1), index);
+ // set.setElementAt(o, index + 1);
+ //
+ // swapped = true;
+ // swapIndex = index;
+ // }
+ //
+ // index++;
+ // }
+ //
+ // lastSwap = swapIndex;
+ // }
+ // }
+ // }
+ //
+ // protected void addObject(
+ // DEREncodable obj)
+ // {
+ // set.addElement(obj);
+ // }
+ //
+ // abstract void encode(DEROutputStream out)
+ // throws IOException;
+ //
+ // public String toString()
+ // {
+ // return set.toString();
+ // }
+ // END android-removed
}
diff -Naur bcprov-jdk16-145.orig/org/bouncycastle/asn1/DERBoolean.java bcprov-jdk16-145/org/bouncycastle/asn1/DERBoolean.java
--- bcprov-jdk16-145.orig/org/bouncycastle/asn1/DERBoolean.java 2010-01-11 21:46:14.000000000 +0000
+++ bcprov-jdk16-145/org/bouncycastle/asn1/DERBoolean.java 2011-09-03 18:19:15.000000000 +0000
@@ -5,7 +5,9 @@
public class DERBoolean
extends ASN1Object
{
- byte value;
+ // BEGIN android-changed
+ private final byte value;
+ // END android-changed
public static final DERBoolean FALSE = new DERBoolean(false);
public static final DERBoolean TRUE = new DERBoolean(true);
@@ -25,7 +27,9 @@
if (obj instanceof ASN1OctetString)
{
- return new DERBoolean(((ASN1OctetString)obj).getOctets());
+ // BEGIN android-changed
+ return getInstance(((ASN1OctetString)obj).getOctets());
+ // END android-changed
}
if (obj instanceof ASN1TaggedObject)
@@ -45,6 +49,17 @@
return (value ? TRUE : FALSE);
}
+ // BEGIN android-added
+ /**
+ * return a DERBoolean from the passed in array.
+ */
+ public static DERBoolean getInstance(
+ byte[] octets)
+ {
+ return (octets[0] != 0) ? TRUE : FALSE;
+ }
+ // END android-added
+
/**
* return a Boolean from a tagged object.
*
@@ -60,18 +75,22 @@
{
return getInstance(obj.getObject());
}
-
- public DERBoolean(
- byte[] value)
- {
- this.value = value[0];
- }
- public DERBoolean(
+ // BEGIN android-removed
+ //private DERBoolean(
+ // byte[] value)
+ //{
+ // this.value = value[0];
+ //}
+ // END android-removed
+
+ // BEGIN android-changed
+ private DERBoolean(
boolean value)
{
this.value = (value) ? (byte)0xff : (byte)0;
}
+ // END android-changed
public boolean isTrue()
{
diff -Naur bcprov-jdk16-145.orig/org/bouncycastle/asn1/DERInputStream.java bcprov-jdk16-145/org/bouncycastle/asn1/DERInputStream.java
--- bcprov-jdk16-145.orig/org/bouncycastle/asn1/DERInputStream.java 2010-01-11 21:46:14.000000000 +0000
+++ bcprov-jdk16-145/org/bouncycastle/asn1/DERInputStream.java 2011-09-03 18:19:15.000000000 +0000
@@ -144,7 +144,9 @@
return new DERConstructedSet(v);
}
case BOOLEAN:
- return new DERBoolean(bytes);
+ // BEGIN android-changed
+ return DERBoolean.getInstance(bytes);
+ // BEGIN android-changed
case INTEGER:
return new DERInteger(bytes);
case ENUMERATED:
@@ -195,7 +197,9 @@
{
if ((tag & CONSTRUCTED) == 0)
{
- return new DERTaggedObject(false, tag & 0x1f, new DERNull());
+ // BEGIN android-changed
+ return new DERTaggedObject(false, tag & 0x1f, DERNull.INSTANCE);
+ // END android-changed
}
else
{
diff -Naur bcprov-jdk16-145.orig/org/bouncycastle/asn1/DERNull.java bcprov-jdk16-145/org/bouncycastle/asn1/DERNull.java
--- bcprov-jdk16-145.orig/org/bouncycastle/asn1/DERNull.java 2010-01-11 21:46:14.000000000 +0000
+++ bcprov-jdk16-145/org/bouncycastle/asn1/DERNull.java 2011-09-03 18:19:15.000000000 +0000
@@ -10,9 +10,13 @@
{
public static final DERNull INSTANCE = new DERNull();
- byte[] zeroBytes = new byte[0];
+ // BEGIN android-changed
+ private static final byte[] zeroBytes = new byte[0];
+ // END android-changed
- public DERNull()
+ // BEGIN android-changed
+ protected DERNull()
+ // END android-changed
{
}
diff -Naur bcprov-jdk16-145.orig/org/bouncycastle/asn1/DERObjectIdentifier.java bcprov-jdk16-145/org/bouncycastle/asn1/DERObjectIdentifier.java
--- bcprov-jdk16-145.orig/org/bouncycastle/asn1/DERObjectIdentifier.java 2010-01-11 21:46:14.000000000 +0000
+++ bcprov-jdk16-145/org/bouncycastle/asn1/DERObjectIdentifier.java 2011-09-03 18:19:15.000000000 +0000
@@ -111,7 +111,13 @@
}
}
- this.identifier = objId.toString();
+ // BEGIN android-changed
+ /*
+ * Intern the identifier so there aren't hundreds of duplicates
+ * (in practice).
+ */
+ this.identifier = objId.toString().intern();
+ // END android-changed
}
public DERObjectIdentifier(
@@ -122,7 +128,13 @@
throw new IllegalArgumentException("string " + identifier + " not an OID");
}
- this.identifier = identifier;
+ // BEGIN android-changed
+ /*
+ * Intern the identifier so there aren't hundreds of duplicates
+ * (in practice).
+ */
+ this.identifier = identifier.intern();
+ // END android-changed
}
public String getId()
diff -Naur bcprov-jdk16-145.orig/org/bouncycastle/asn1/DERPrintableString.java bcprov-jdk16-145/org/bouncycastle/asn1/DERPrintableString.java
--- bcprov-jdk16-145.orig/org/bouncycastle/asn1/DERPrintableString.java 2010-01-11 21:46:14.000000000 +0000
+++ bcprov-jdk16-145/org/bouncycastle/asn1/DERPrintableString.java 2011-09-03 18:19:15.000000000 +0000
@@ -9,7 +9,9 @@
extends ASN1Object