Make the Serial Numbers DER Wrapped rather than raw serial numbers.

This is required by PKCS #11 and was causing some bugs in NSS 3.6.

1 files changed, 183 insertions, 151 deletions

diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt
index 029f85103..3e28a3c6d 100644
--- a/security/nss/lib/ckfw/builtins/certdata.txt
+++ b/security/nss/lib/ckfw/builtins/certdata.txt
@@ -126,7 +126,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\255\146\176\116\105\376\136\127\157\074\230\031\136\335\300
+\002\020\002\255\146\176\116\105\376\136\127\157\074\230\031\136
+\335\300
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\002\064\060\202\001\241\002\020\002\255\146\176\116\105
@@ -190,7 +191,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\255\146\176\116\105\376\136\127\157\074\230\031\136\335\300
+\002\020\002\255\146\176\116\105\376\136\127\157\074\230\031\136
+\335\300
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -221,7 +223,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \163\164\040\122\157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001\243
+\002\002\001\243
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\001\372\060\202\001\143\002\002\001\243\060\015\006\011
@@ -279,7 +281,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \163\164\040\122\157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001\243
+\002\002\001\243
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -316,7 +318,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \141\154\040\122\157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001\245
+\002\002\001\245
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\002\132\060\202\001\303\002\002\001\245\060\015\006\011
@@ -383,7 +385,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \141\154\040\122\157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001\245
+\002\002\001\245
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -430,7 +432,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \163\151\143\100\164\150\141\167\164\145\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000
+\002\001\000
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\041\060\202\002\212\240\003\002\001\002\002\001\000
@@ -515,7 +517,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \163\151\143\100\164\150\141\167\164\145\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000
+\002\001\000
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -564,7 +566,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000
+\002\001\000
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\051\060\202\002\222\240\003\002\001\002\002\001\000
@@ -650,7 +652,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000
+\002\001\000
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -699,7 +701,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000
+\002\001\000
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\055\060\202\002\226\240\003\002\001\002\002\001\000
@@ -786,7 +788,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000
+\002\001\000
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -833,7 +835,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \167\164\145\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\023\060\202\002\174\240\003\002\001\002\002\001\001
@@ -917,7 +919,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \167\164\145\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
@@ -966,7 +968,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\047\060\202\002\220\240\003\002\001\002\002\001\001
@@ -1052,7 +1054,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
@@ -1083,7 +1085,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\065\336\364\317
+\002\004\065\336\364\317
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\040\060\202\002\211\240\003\002\001\002\002\004\065
@@ -1160,7 +1162,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\065\336\364\317
+\002\004\065\336\364\317
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -1199,8 +1201,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \163\151\147\164\162\165\163\164\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\320\036\100\220\000\000\106\122\000\000\000\001\000\000\000
-\004
+\002\021\000\320\036\100\220\000\000\106\122\000\000\000\001\000
+\000\000\004
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\265\060\202\002\235\240\003\002\001\002\002\021\000
@@ -1290,8 +1292,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \163\151\147\164\162\165\163\164\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\320\036\100\220\000\000\106\122\000\000\000\001\000\000\000
-\004
+\002\021\000\320\036\100\220\000\000\106\122\000\000\000\001\000
+\000\000\004
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -1322,7 +1324,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \104\123\124\103\101\040\105\061
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\066\160\025\226
+\002\004\066\160\025\226
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\051\060\202\002\222\240\003\002\001\002\002\004\066
@@ -1399,7 +1401,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \104\123\124\103\101\040\105\061
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\066\160\025\226
+\002\004\066\160\025\226
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -1430,7 +1432,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \104\123\124\103\101\040\105\062
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\066\156\323\316
+\002\004\066\156\323\316
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\051\060\202\002\222\240\003\002\001\002\002\004\066
@@ -1507,7 +1509,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \104\123\124\103\101\040\105\062
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\066\156\323\316
+\002\004\066\156\323\316
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -1550,8 +1552,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \163\151\147\164\162\165\163\164\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\320\036\100\213\000\000\002\174\000\000\000\002\000\000\000
-\001
+\002\021\000\320\036\100\213\000\000\002\174\000\000\000\002\000
+\000\000\001
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\330\060\202\002\300\002\021\000\320\036\100\213\000
@@ -1645,8 +1647,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \163\151\147\164\162\165\163\164\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\320\036\100\213\000\000\002\174\000\000\000\002\000\000\000
-\001
+\002\021\000\320\036\100\213\000\000\002\174\000\000\000\002\000
+\000\000\001
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -1689,8 +1691,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \163\151\147\164\162\165\163\164\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\320\036\100\213\000\000\167\155\000\000\000\001\000\000\000
-\004
+\002\021\000\320\036\100\213\000\000\167\155\000\000\000\001\000
+\000\000\004
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\330\060\202\002\300\002\021\000\320\036\100\213\000
@@ -1784,8 +1786,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \163\151\147\164\162\165\163\164\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\320\036\100\213\000\000\167\155\000\000\000\001\000\000\000
-\004
+\002\021\000\320\036\100\213\000\000\167\155\000\000\000\001\000
+\000\000\004
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -1820,8 +1822,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\315\272\177\126\360\337\344\274\124\376\042\254\263\162\252
-\125
+\002\021\000\315\272\177\126\360\337\344\274\124\376\042\254\263
+\162\252\125
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\002\075\060\202\001\246\002\021\000\315\272\177\126\360
@@ -1886,8 +1888,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\315\272\177\126\360\337\344\274\124\376\042\254\263\162\252
-\125
+\002\021\000\315\272\177\126\360\337\344\274\124\376\042\254\263
+\162\252\125
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -1922,7 +1924,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\055\033\374\112\027\215\243\221\353\347\377\365\213\105\276\013
+\002\020\055\033\374\112\027\215\243\221\353\347\377\365\213\105
+\276\013
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\002\074\060\202\001\245\002\020\055\033\374\112\027\215
@@ -1986,7 +1989,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\055\033\374\112\027\215\243\221\353\347\377\365\213\105\276\013
+\002\020\055\033\374\112\027\215\243\221\353\347\377\365\213\105
+\276\013
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -2021,7 +2025,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\160\272\344\035\020\331\051\064\266\070\312\173\003\314\272\277
+\002\020\160\272\344\035\020\331\051\064\266\070\312\173\003\314
+\272\277
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\002\074\060\202\001\245\002\020\160\272\344\035\020\331
@@ -2085,7 +2090,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\160\272\344\035\020\331\051\064\266\070\312\173\003\314\272\277
+\002\020\160\272\344\035\020\331\051\064\266\070\312\173\003\314
+\272\277
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -2132,7 +2138,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \167\157\162\153
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\114\307\352\252\230\076\161\323\223\020\370\075\072\211\221\222
+\002\020\114\307\352\252\230\076\161\323\223\020\370\075\072\211
+\221\222
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\002\060\202\002\153\002\020\114\307\352\252\230\076
@@ -2215,7 +2222,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \167\157\162\153
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\114\307\352\252\230\076\161\323\223\020\370\075\072\211\221\222
+\002\020\114\307\352\252\230\076\161\323\223\020\370\075\072\211
+\221\222
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -2262,8 +2270,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \167\157\162\153
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\271\057\140\314\210\237\241\172\106\011\270\133\160\154\212
-\257
+\002\021\000\271\057\140\314\210\237\241\172\106\011\270\133\160
+\154\212\257
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\003\060\202\002\154\002\021\000\271\057\140\314\210
@@ -2346,8 +2354,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \167\157\162\153
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\271\057\140\314\210\237\241\172\106\011\270\133\160\154\212
-\257
+\002\021\000\271\057\140\314\210\237\241\172\106\011\270\133\160
+\154\212\257
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -2394,7 +2402,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \167\157\162\153
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\175\331\376\007\317\250\036\267\020\171\147\373\247\211\064\306
+\002\020\175\331\376\007\317\250\036\267\020\171\147\373\247\211
+\064\306
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\002\060\202\002\153\002\020\175\331\376\007\317\250
@@ -2477,7 +2486,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \167\157\162\153
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\175\331\376\007\317\250\036\267\020\171\147\373\247\211\064\306
+\002\020\175\331\376\007\317\250\036\267\020\171\147\373\247\211
+\064\306
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -2524,7 +2534,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \167\157\162\153
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\062\210\216\232\322\365\353\023\107\370\177\304\040\067\045\370
+\002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067
+\045\370
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\002\060\202\002\153\002\020\062\210\216\232\322\365
@@ -2607,7 +2618,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \167\157\162\153
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\062\210\216\232\322\365\353\023\107\370\177\304\040\067\045\370
+\002\020\062\210\216\232\322\365\353\023\107\370\177\304\040\067
+\045\370
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -2640,7 +2652,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \156\040\122\157\157\164\040\103\101
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\000\000\000\000\000\326\170\267\224\005
+\002\013\002\000\000\000\000\000\326\170\267\224\005
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\165\060\202\002\135\240\003\002\001\002\002\013\002
@@ -2723,7 +2735,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \156\040\122\157\157\164\040\103\101
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\000\000\000\000\000\326\170\267\224\005
+\002\013\002\000\000\000\000\000\326\170\267\224\005
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -2768,7 +2780,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \157\100\166\141\154\151\143\145\162\164\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052
@@ -2848,7 +2860,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \157\100\166\141\154\151\143\145\162\164\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -2893,7 +2905,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \157\100\166\141\154\151\143\145\162\164\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052
@@ -2973,7 +2985,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \157\100\166\141\154\151\143\145\162\164\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -3018,7 +3030,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \157\100\166\141\154\151\143\145\162\164\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\002\347\060\202\002\120\002\001\001\060\015\006\011\052
@@ -3098,7 +3110,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \157\100\166\141\154\151\143\145\162\164\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -3145,8 +3157,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \165\164\150\157\162\151\164\171\040\055\040\107\063
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\213\133\165\126\204\124\205\013\000\317\257\070\110\316\261
-\244
+\002\021\000\213\133\165\126\204\124\205\013\000\317\257\070\110
+\316\261\244
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\004\032\060\202\003\002\002\021\000\213\133\165\126\204
@@ -3246,8 +3258,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \165\164\150\157\162\151\164\171\040\055\040\107\063
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\213\133\165\126\204\124\205\013\000\317\257\070\110\316\261
-\244
+\002\021\000\213\133\165\126\204\124\205\013\000\317\257\070\110
+\316\261\244
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -3294,7 +3306,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \165\164\150\157\162\151\164\171\040\055\040\107\063
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\141\160\313\111\214\137\230\105\051\347\260\246\331\120\133\172
+\002\020\141\160\313\111\214\137\230\105\051\347\260\246\331\120
+\133\172
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\004\031\060\202\003\001\002\020\141\160\313\111\214\137
@@ -3394,7 +3407,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \165\164\150\157\162\151\164\171\040\055\040\107\063
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\141\160\313\111\214\137\230\105\051\347\260\246\331\120\133\172
+\002\020\141\160\313\111\214\137\230\105\051\347\260\246\331\120
+\133\172
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -3441,8 +3455,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \165\164\150\157\162\151\164\171\040\055\040\107\063
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\233\176\006\111\243\076\142\271\325\356\220\110\161\051\357
-\127
+\002\021\000\233\176\006\111\243\076\142\271\325\356\220\110\161
+\051\357\127
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\004\032\060\202\003\002\002\021\000\233\176\006\111\243
@@ -3542,8 +3556,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \165\164\150\157\162\151\164\171\040\055\040\107\063
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\233\176\006\111\243\076\142\271\325\356\220\110\161\051\357
-\127
+\002\021\000\233\176\006\111\243\076\142\271\325\356\220\110\161
+\051\357\127
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -3590,8 +3604,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \165\164\150\157\162\151\164\171\040\055\040\107\063
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\354\240\247\213\156\165\152\001\317\304\174\314\057\224\136
-\327
+\002\021\000\354\240\247\213\156\165\152\001\317\304\174\314\057
+\224\136\327
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\004\032\060\202\003\002\002\021\000\354\240\247\213\156
@@ -3691,8 +3705,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \165\164\150\157\162\151\164\171\040\055\040\107\063
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\354\240\247\213\156\165\152\001\317\304\174\314\057\224\136
-\327
+\002\021\000\354\240\247\213\156\165\152\001\317\304\174\314\057
+\224\136\327
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -3739,7 +3753,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \150\157\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\067\112\322\103
+\002\004\067\112\322\103
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\004\330\060\202\004\101\240\003\002\001\002\002\004\067
@@ -3851,7 +3865,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \150\157\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\067\112\322\103
+\002\004\067\112\322\103
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -3898,7 +3912,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \157\156\040\101\165\164\150\157\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\070\003\221\356
+\002\004\070\003\221\356
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\004\355\060\202\004\126\240\003\002\001\002\002\004\070
@@ -4012,7 +4026,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \157\156\040\101\165\164\150\157\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\070\003\221\356
+\002\004\070\003\221\356
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -4057,7 +4071,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \040\050\062\060\064\070\051
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\070\143\271\146
+\002\004\070\143\271\146
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\004\134\060\202\003\104\240\003\002\001\002\002\004\070
@@ -4160,7 +4174,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \040\050\062\060\064\070\051
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\070\143\271\146
+\002\004\070\143\271\146
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -4205,7 +4219,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \164\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\110\060\202\002\261\240\003\002\001\002\002\001\001
@@ -4291,7 +4305,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \164\056\143\157\155
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -4326,7 +4340,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \156\151\156\147\040\122\157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\000\000\277
+\002\004\002\000\000\277
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\246\060\202\002\216\240\003\002\001\002\002\004\002
@@ -4413,7 +4427,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \156\151\156\147\040\122\157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\000\000\277
+\002\004\002\000\000\277
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
@@ -4446,7 +4460,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \145\162\124\162\165\163\164\040\122\157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\000\000\271
+\002\004\002\000\000\271
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\167\060\202\002\137\240\003\002\001\002\002\004\002
@@ -4529,7 +4543,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \145\162\124\162\165\163\164\040\122\157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\000\000\271
+\002\004\002\000\000\271
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -4564,7 +4578,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\000\000\270
+\002\004\002\000\000\270
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\002\175\060\202\001\346\240\003\002\001\002\002\004\002
@@ -4633,7 +4647,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\000\000\270
+\002\004\002\000\000\270
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -4666,7 +4680,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \165\163\151\156\145\163\163\040\103\101\055\061
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\002\220\060\202\001\371\240\003\002\001\002\002\001\001
@@ -4735,7 +4749,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \165\163\151\156\145\163\163\040\103\101\055\061
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -4768,7 +4782,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \040\103\101\055\061
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\004
+\002\001\004
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\002\202\060\202\001\353\240\003\002\001\002\002\001\004
@@ -4836,7 +4850,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \040\103\101\055\061
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\004
+\002\001\004
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -4867,7 +4881,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\067\160\317\265
+\002\004\067\160\317\265
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\040\060\202\002\211\240\003\002\001\002\002\004\067
@@ -4944,7 +4958,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \145\040\145\102\165\163\151\156\145\163\163\040\103\101\055\062
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\067\160\317\265
+\002\004\067\160\317\265
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -4979,7 +4993,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \164\040\062
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\003\036
+\002\002\003\036
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\200\060\202\002\150\240\003\002\001\002\002\002\003
@@ -5064,7 +5078,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \164\040\062
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\003\036
+\002\002\003\036
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -5097,7 +5111,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \123\124\145\144\040\122\157\157\164\040\103\101
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\071\117\175\207
+\002\004\071\117\175\207
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\005\054\060\202\004\024\240\003\002\001\002\002\004\071
@@ -5207,7 +5221,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \123\124\145\144\040\122\157\157\164\040\103\101
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\071\117\175\207
+\002\004\071\117\175\207
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -5242,7 +5256,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \103\101\040\122\157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\004\030\060\202\003\000\240\003\002\001\002\002\001\001
@@ -5336,7 +5350,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \103\101\040\122\157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -5373,7 +5387,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\004\066\060\202\003\036\240\003\002\001\002\002\001\001
@@ -5470,7 +5484,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -5505,7 +5519,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \101\040\122\157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\004\025\060\202\002\375\240\003\002\001\002\002\001\001
@@ -5600,7 +5614,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -5730,7 +5744,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \144\040\103\101\040\122\157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -5769,7 +5783,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\053\150\324\243\106\236\305\073\050\011\253\070\135\177\047\040
+\002\020\053\150\324\243\106\236\305\073\050\011\253\070\135\177
+\047\040
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\236\060\202\003\007\240\003\002\001\002\002\020\053
@@ -5856,7 +5871,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\053\150\324\243\106\236\305\073\050\011\253\070\135\177\047\040
+\002\020\053\150\324\243\106\236\305\073\050\011\253\070\135\177
+\047\040
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -5895,7 +5911,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\011\106\027\346\035\330\324\034\240\014\240\142\350\171\212\247
+\002\020\011\106\027\346\035\330\324\034\240\014\240\142\350\171
+\212\247
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\236\060\202\003\007\240\003\002\001\002\002\020\011
@@ -5982,7 +5999,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\011\106\027\346\035\330\324\034\240\014\240\142\350\171\212\247
+\002\020\011\106\027\346\035\330\324\034\240\014\240\142\350\171
+\212\247
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -6021,7 +6039,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\056\226\236\277\266\142\154\354\173\351\163\314\343\154\301\204
+\002\020\056\226\236\277\266\142\154\354\173\351\163\314\343\154
+\301\204
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\242\060\202\003\013\240\003\002\001\002\002\020\056
@@ -6108,7 +6127,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\056\226\236\277\266\142\154\354\173\351\163\314\343\154\301\204
+\002\020\056\226\236\277\266\142\154\354\173\351\163\314\343\154
+\301\204
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -6147,8 +6167,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\377\105\325\047\135\044\373\263\302\071\044\123\127\341\117
-\336
+\002\021\000\377\105\325\047\135\044\373\263\302\071\044\123\127
+\341\117\336
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\237\060\202\003\014\240\003\002\001\002\002\021\000
@@ -6235,8 +6255,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000\377\105\325\047\135\044\373\263\302\071\044\123\127\341\117
-\336
+\002\021\000\377\105\325\047\135\044\373\263\302\071\044\123\127
+\341\117\336
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -6281,7 +6301,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \167\157\162\153
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\123\141\262\140\256\333\161\216\247\224\263\023\063\364\007\011
+\002\020\123\141\262\140\256\333\161\216\247\224\263\023\063\364
+\007\011
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\315\060\202\003\066\240\003\002\001\002\002\020\123
@@ -6377,7 +6398,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \167\157\162\153
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\123\141\262\140\256\333\161\216\247\224\263\023\063\364\007\011
+\002\020\123\141\262\140\256\333\161\216\247\224\263\023\063\364
+\007\011
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -6416,7 +6438,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \151\155\145\163\164\141\155\160\151\156\147\040\103\101
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000
+\002\001\000
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\002\241\060\202\002\012\240\003\002\001\002\002\001\000
@@ -6489,7 +6511,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \151\155\145\163\164\141\155\160\151\156\147\040\103\101
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\000
+\002\001\000
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -6534,7 +6556,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \151\157\156\040\101\165\164\150\157\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\070\233\021\074
+\002\004\070\233\021\074
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\004\225\060\202\003\376\240\003\002\001\002\002\004\070
@@ -6641,7 +6663,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \151\157\156\040\101\165\164\150\157\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\070\233\021\074
+\002\004\070\233\021\074
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -6686,7 +6708,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \164\150\157\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\070\236\366\344
+\002\004\070\236\366\344
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\004\203\060\202\003\354\240\003\002\001\002\002\004\070
@@ -6792,7 +6814,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \164\150\157\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\070\236\366\344
+\002\004\070\236\366\344
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -6831,7 +6853,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \162\151\164\171\040\061
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\346\060\202\002\316\240\003\002\001\002\002\001\001
@@ -6924,7 +6946,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \162\151\164\171\040\061
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -6963,7 +6985,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \162\151\164\171\040\062
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\005\346\060\202\003\316\240\003\002\001\002\002\001\001
@@ -7088,7 +7110,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \162\151\164\171\040\062
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -7123,7 +7145,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \145\156\164\141\164\151\157\156
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\074\265\075\106
+\002\004\074\265\075\106
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\005\152\060\202\004\122\240\003\002\001\002\002\004\074
@@ -7238,7 +7260,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \145\156\164\141\164\151\157\156
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\074\265\075\106
+\002\004\074\265\075\106
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -7273,7 +7295,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \145\156\164\141\164\151\157\156
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\074\265\117\100
+\002\004\074\265\117\100
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\006\121\060\202\005\071\240\003\002\001\002\002\004\074
@@ -7403,7 +7425,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \145\156\164\141\164\151\157\156
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\074\265\117\100
+\002\004\074\265\117\100
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -7438,7 +7460,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \164\151\157\156
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\073\131\307\173\315\133\127\236\275\067\122\254\166\264\252\032
+\002\020\073\131\307\173\315\133\127\236\275\067\122\254\166\264
+\252\032
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\005\150\060\202\004\120\240\003\002\001\002\002\020\073
@@ -7553,7 +7576,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \164\151\157\156
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\073\131\307\173\315\133\127\236\275\067\122\254\166\264\252\032
+\002\020\073\131\307\173\315\133\127\236\275\067\122\254\166\264
+\252\032
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -7582,7 +7606,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \162\151\164\171\040\062\060\064\070\040\126\063
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\012\001\001\001\000\000\002\174\000\000\000\012\000\000\000\002
+\002\020\012\001\001\001\000\000\002\174\000\000\000\012\000\000
+\000\002
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\141\060\202\002\111\240\003\002\001\002\002\020\012
@@ -7662,7 +7687,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \162\151\164\171\040\062\060\064\070\040\126\063
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\012\001\001\001\000\000\002\174\000\000\000\012\000\000\000\002
+\002\020\012\001\001\001\000\000\002\174\000\000\000\012\000\000
+\000\002
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -7691,7 +7717,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \162\151\164\171\040\061\060\062\064\040\126\063
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\012\001\001\001\000\000\002\174\000\000\000\013\000\000\000\002
+\002\020\012\001\001\001\000\000\002\174\000\000\000\013\000\000
+\000\002
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\002\134\060\202\001\305\240\003\002\001\002\002\020\012
@@ -7754,7 +7781,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \162\151\164\171\040\061\060\062\064\040\126\063
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\012\001\001\001\000\000\002\174\000\000\000\013\000\000\000\002
+\002\020\012\001\001\001\000\000\002\174\000\000\000\013\000\000
+\000\002
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -7785,7 +7813,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \154\040\103\101
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\064\126
+\002\003\002\064\126
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\124\060\202\002\074\240\003\002\001\002\002\003\002
@@ -7865,7 +7893,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \154\040\103\101
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\064\126
+\002\003\002\064\126
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -7908,7 +7936,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \141\164\151\157\156\163
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\104\276\014\213\120\000\044\264\021\323\066\060\113\300\063\167
+\002\020\104\276\014\213\120\000\044\264\021\323\066\060\113\300
+\063\167
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\004\144\060\202\003\114\240\003\002\001\002\002\020\104
@@ -8011,7 +8040,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \141\164\151\157\156\163
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\104\276\014\213\120\000\044\264\021\323\066\060\113\300\063\167
+\002\020\104\276\014\213\120\000\044\264\021\323\066\060\113\300
+\063\167
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -8046,7 +8076,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \151\164\171\040\061
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\244\060\202\002\214\240\003\002\001\002\002\001\001
@@ -8133,7 +8163,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \151\164\171\040\061
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -8168,7 +8198,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \151\164\171\040\062
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\005\244\060\202\003\214\240\003\002\001\002\002\001\001
@@ -8287,7 +8317,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \151\164\171\040\062
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -8322,7 +8352,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \103\157\155\155\145\162\143\145\040\122\157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\023\206\065\115\035\077\006\362\301\371\145\005\325\220\034\142
+\002\020\023\206\065\115\035\077\006\362\301\371\145\005\325\220
+\034\142
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\242\060\202\002\212\240\003\002\001\002\002\020\023
@@ -8409,7 +8440,8 @@ CKA_ISSUER MULTILINE_OCTAL
 \103\157\155\155\145\162\143\145\040\122\157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\023\206\065\115\035\077\006\362\301\371\145\005\325\220\034\142
+\002\020\023\206\065\115\035\077\006\362\301\371\145\005\325\220
+\034\142
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -8454,7 +8486,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \100\164\162\165\163\164\143\145\156\164\145\162\056\144\145
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\003\352
+\002\002\003\352
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\134\060\202\002\305\240\003\002\001\002\002\002\003
@@ -8541,7 +8573,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \100\164\162\165\163\164\143\145\156\164\145\162\056\144\145
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\003\352
+\002\002\003\352
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
@@ -8586,7 +8618,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \100\164\162\165\163\164\143\145\156\164\145\162\056\144\145
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\003\353
+\002\002\003\353
 END
 CKA_VALUE MULTILINE_OCTAL
 \060\202\003\134\060\202\002\305\240\003\002\001\002\002\002\003
@@ -8673,7 +8705,7 @@ CKA_ISSUER MULTILINE_OCTAL
 \100\164\162\165\163\164\143\145\156\164\145\162\056\144\145
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\003\353
+\002\002\003\353
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR