Skip to content

Commit 3d7b78c

Browse files
committed
[enh] style for x509.js
1 parent 3575282 commit 3d7b78c

File tree

1 file changed

+95
-71
lines changed

1 file changed

+95
-71
lines changed

‎njs/http/certs/js/x509.js

Lines changed: 95 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,19 @@ function asn1_parse_oid(buf) {
66
if (cur_octet < 40) {
77
oid.push(0);
88
oid.push(cur_octet);
9+
910
} else if (cur_octet < 80) {
1011
oid.push(1);
1112
oid.push(cur_octet - 40);
13+
1214
} else {
1315
oid.push(2);
1416
oid.push(cur_octet - 80);
1517
}
1618

1719
for (var n = 1; n < buf.length; n++) {
1820
cur_octet = buf.charCodeAt(n);
21+
1922
if (cur_octet < 0x80) {
2023
sid += cur_octet;
2124

@@ -24,6 +27,7 @@ function asn1_parse_oid(buf) {
2427

2528
oid.push(sid);
2629
sid = 0;
30+
2731
} else {
2832
sid += cur_octet & 0x7f; sid <<= 7;
2933

@@ -52,6 +56,7 @@ function asn1_parse_integer(buf) {
5256
is_negative = true;
5357
value = buf.charCodeAt(0) & 0x7f;
5458
var compl_int = 1 << (8 * buf.length - 1)
59+
5560
} else {
5661
value = buf.charCodeAt(0);
5762
}
@@ -111,6 +116,7 @@ function asn1_parse_bit_string(buf) {
111116
upper_bits = (buf.charCodeAt(n) << shift) & 0xff;
112117
value += symbol;
113118
}
119+
114120
return value;
115121
}
116122

@@ -141,95 +147,98 @@ function asn1_read_length(buf, pointer) {
141147
// length is less than 128
142148
pointer++;
143149
return [s, pointer];
150+
144151
} else {
145152
var l = s & 0x7f;
146153
if (l > 7)
147154
throw "Too big length, exceeds MAX_SAFE_INTEGER: " + l;
155+
148156
if ((pointer + l) >= buf.length)
149157
throw "Went out of buffer: " + (pointer + l) + " " + buf.length;
158+
150159
var length = 0;
151160
for (var n = 0; n < l; n++) {
152161
length += Math.pow(256, l - n - 1) * buf.charCodeAt(++pointer);
153162
if (n == 6 && buf.charCodeAt(pointer) > 0x1f)
154163
throw "Too big length, exceeds MAX_SAFE_INTEGER";
155164
}
156165

157-
return [length, pointer+1];
166+
return [length, pointer + 1];
158167
}
159168
}
160169

161170
function asn1_parse_primitive(cls, tag, buf) {
162171
if (cls == 0) {
163172
switch(tag) {
164-
// INTEGER
165-
case 0x02: return asn1_parse_integer(buf);
166-
// BIT STRING
167-
case 0x03:
168-
try {
169-
return asn1_read(buf);
170-
} catch(e) {
171-
return asn1_parse_bit_string(buf);
172-
}
173-
// OCTET STRING
174-
case 0x04:
175-
try {
176-
return asn1_read(buf);
177-
} catch(e) {
178-
return asn1_parse_octet_string(buf);
179-
}
180-
// OBJECT IDENTIFIER
181-
case 0x06: return asn1_parse_oid(buf);
182-
// UTF8String
183-
case 0x0c: return asn1_parse_utf8_string(buf);
184-
// TIME
185-
case 0x0e:
186-
// NumericString
187-
case 0x12:
188-
// PrintableString
189-
case 0x13:
190-
// T61String
191-
case 0x14:
192-
// VideotexString
193-
case 0x15:
194-
return asn1_parse_ascii_string(buf);
195-
// IA5String
196-
case 0x16: return asn1_parse_ia5_string(buf);
197-
// UTCTime
198-
case 0x17:
199-
// GeneralizedTime
200-
case 0x18:
201-
// GraphicString
202-
case 0x19:
203-
// VisibleString
204-
case 0x1a:
205-
// GeneralString
206-
case 0x1b:
207-
return asn1_parse_ascii_string(buf);
208-
// UniversalString
209-
case 0x1c: return asn1_parse_universal_string(buf);
210-
// CHARACTER STRING
211-
case 0x1d: return asn1_parse_ascii_string(buf);
212-
// BMPString
213-
case 0x1e: return asn1_parse_bmp_string(buf);
214-
// DATE
215-
case 0x1f:
216-
// TIME-OF-DAY
217-
case 0x20:
218-
// DATE-TIME
219-
case 0x21:
220-
// DURATION
221-
case 0x22:
222-
return asn1_parse_ascii_string(buf);
223-
default: return asn1_parse_any(buf);
173+
// INTEGER
174+
case 0x02: return asn1_parse_integer(buf);
175+
// BIT STRING
176+
case 0x03:
177+
try {
178+
return asn1_read(buf);
179+
} catch(e) {
180+
return asn1_parse_bit_string(buf);
181+
}
182+
// OCTET STRING
183+
case 0x04:
184+
try {
185+
return asn1_read(buf);
186+
} catch(e) {
187+
return asn1_parse_octet_string(buf);
188+
}
189+
// OBJECT IDENTIFIER
190+
case 0x06: return asn1_parse_oid(buf);
191+
// UTF8String
192+
case 0x0c: return asn1_parse_utf8_string(buf);
193+
// TIME
194+
case 0x0e:
195+
// NumericString
196+
case 0x12:
197+
// PrintableString
198+
case 0x13:
199+
// T61String
200+
case 0x14:
201+
// VideotexString
202+
case 0x15:
203+
return asn1_parse_ascii_string(buf);
204+
// IA5String
205+
case 0x16: return asn1_parse_ia5_string(buf);
206+
// UTCTime
207+
case 0x17:
208+
// GeneralizedTime
209+
case 0x18:
210+
// GraphicString
211+
case 0x19:
212+
// VisibleString
213+
case 0x1a:
214+
// GeneralString
215+
case 0x1b:
216+
return asn1_parse_ascii_string(buf);
217+
// UniversalString
218+
case 0x1c: return asn1_parse_universal_string(buf);
219+
// CHARACTER STRING
220+
case 0x1d: return asn1_parse_ascii_string(buf);
221+
// BMPString
222+
case 0x1e: return asn1_parse_bmp_string(buf);
223+
// DATE
224+
case 0x1f:
225+
// TIME-OF-DAY
226+
case 0x20:
227+
// DATE-TIME
228+
case 0x21:
229+
// DURATION
230+
case 0x22:
231+
return asn1_parse_ascii_string(buf);
232+
default: return asn1_parse_any(buf);
224233
}
225234

226235
} else if (cls == 2) {
227236
switch(tag) {
228-
case 0x00: return asn1_parse_any(buf);
229-
case 0x01: return asn1_parse_ascii_string(buf);
230-
case 0x02: return asn1_parse_ascii_string(buf);
231-
case 0x06: return asn1_parse_ascii_string(buf);
232-
default: return asn1_parse_any(buf);
237+
case 0x00: return asn1_parse_any(buf);
238+
case 0x01: return asn1_parse_ascii_string(buf);
239+
case 0x02: return asn1_parse_ascii_string(buf);
240+
case 0x06: return asn1_parse_ascii_string(buf);
241+
default: return asn1_parse_any(buf);
233242
}
234243
}
235244

@@ -255,32 +264,43 @@ function asn1_read(buf) {
255264
if (tag == 0x1f) {
256265
tag = 0;
257266
var i = 0;
267+
258268
do {
259269
if (i > 3)
260270
throw "Too big tag value" + tag;
271+
261272
i++;
273+
262274
if (++pointer >= buf.length)
263275
throw "Went out of buffer: " + pointer + " " + buf.length;
276+
264277
tag <<= 7;
265278
tag += (buf.charCodeAt(pointer) & 0x7f);
279+
266280
} while (buf.charCodeAt(pointer) > 0x80)
267281
}
268282

269283
if (++pointer > buf.length)
270284
throw "Went out of buffer: " + pointer + " " + buf.length;
285+
271286
var lp = asn1_read_length(buf, pointer);
272287
length = lp[0];
273288
pointer = lp[1];
289+
274290
if ((pointer + length) > buf.length)
275291
throw "length exceeds buf side: " + length + " " + pointer + " "
276292
+ buf.length;
293+
277294
if (is_constructed) {
278295
a.push(asn1_read(buf.slice(pointer, pointer + length)));
296+
279297
} else {
280298
a.push(asn1_parse_primitive(tag_class, tag,buf.slice(pointer, pointer + length)));
281299
}
300+
282301
pointer += length;
283302
}
303+
284304
return a;
285305
}
286306

@@ -289,34 +309,36 @@ function is_oid_exist(cert, oid) {
289309
if (Array.isArray(cert[n])) {
290310
if (is_oid_exist(cert[n], oid))
291311
return true;
312+
292313
} else {
293314
if (cert[n] == oid)
294315
return true;
295316
}
296317
}
318+
297319
return false;
298320
}
299321

300322
// returns all the matching field with the specified 'oid' as a list
301323
function get_oid_value_all(cert, oid) {
302-
303324
var values = [];
304325

305326
for (var n = 0; n < cert.length; n++) {
306327
if (Array.isArray(cert[n])) {
307328
var r = get_oid_value_all(cert[n], oid);
308-
if (r.length > 0) {
309-
values = values.concat(r);
310-
}
329+
if (r.length > 0) {
330+
values = values.concat(r);
331+
}
311332
} else {
312333
if (cert[n] == oid) {
313334
if (n < cert.length) {
314335
// push next element in array
315-
values.push(cert[n+1]);
336+
values.push(cert[n+1]);
316337
}
317338
}
318339
}
319340
}
341+
320342
return values;
321343
}
322344

@@ -326,6 +348,7 @@ function get_oid_value(cert, oid) {
326348
var r = get_oid_value(cert[n], oid);
327349
if (r !== false)
328350
return r;
351+
329352
} else {
330353
if (cert[n] == oid) {
331354
if (n < cert.length) {
@@ -335,6 +358,7 @@ function get_oid_value(cert, oid) {
335358
}
336359
}
337360
}
361+
338362
return false;
339363
}
340364

0 commit comments

Comments
 (0)