ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Convert-BER-XS/XS.xs
(Generate patch)

Comparing Convert-BER-XS/XS.xs (file contents):
Revision 1.17 by root, Sat Apr 20 15:45:21 2019 UTC vs.
Revision 1.21 by root, Sat Apr 20 17:23:21 2019 UTC

… …
58 ASN_CLASS_SHIFT = 6, 58 ASN_CLASS_SHIFT = 6,
59 59
60 // ASN_APPLICATION SNMP 60 // ASN_APPLICATION SNMP
61 SNMP_IPADDRESS = 0x00, 61 SNMP_IPADDRESS = 0x00,
62 SNMP_COUNTER32 = 0x01, 62 SNMP_COUNTER32 = 0x01,
63 SNMP_GAUGE32 = 0x02,
63 SNMP_UNSIGNED32 = 0x02, 64 SNMP_UNSIGNED32 = 0x02,
64 SNMP_TIMETICKS = 0x03, 65 SNMP_TIMETICKS = 0x03,
65 SNMP_OPAQUE = 0x04, 66 SNMP_OPAQUE = 0x04,
66 SNMP_COUNTER64 = 0x06, 67 SNMP_COUNTER64 = 0x06,
67}; 68};
… …
252// get ber-encoded integer (i.e. pack "w") 253// get ber-encoded integer (i.e. pack "w")
253static UV 254static UV
254get_w (void) 255get_w (void)
255{ 256{
256 UV res = 0; 257 UV res = 0;
258 U8 c = get_u8 ();
259
260 if (expect_false (c == 0x80))
261 error ("illegal BER padding (X.690 8.1.2.4.2, 8.19.2)");
257 262
258 for (;;) 263 for (;;)
259 { 264 {
260 U8 c = get_u8 ();
261 res = (res << 7) | (c & 0x7f); 265 res = (res << 7) | (c & 0x7f);
262 266
263 if (!(c & 0x80)) 267 if (!(c & 0x80))
264 return res; 268 return res;
269
270 c = get_u8 ();
265 } 271 }
266} 272}
267 273
268static UV 274static UV
269get_length (void) 275get_length (void)
… …
277 283
278 switch (cnt) 284 switch (cnt)
279 { 285 {
280 case 0: 286 case 0:
281 error ("indefinite ASN.1 lengths not supported"); 287 error ("indefinite ASN.1 lengths not supported");
282 return 0; 288
289 case 0x7f:
290 error ("ASN.1 reserved value in length (X.690 8.1.3.5)");
283 291
284 default: 292 default:
285 error ("ASN.1 length too long"); 293 error ("ASN.1 length too long (only up to 2**64 octets supported)");
286 return 0;
287 294
288 case 8: res = (res << 8) | get_u8 (); 295 case 8: res = (res << 8) | get_u8 ();
289 case 7: res = (res << 8) | get_u8 (); 296 case 7: res = (res << 8) | get_u8 ();
290 case 6: res = (res << 8) | get_u8 (); 297 case 6: res = (res << 8) | get_u8 ();
291 case 5: res = (res << 8) | get_u8 (); 298 case 5: res = (res << 8) | get_u8 ();
… …
303decode_int (void) 310decode_int (void)
304{ 311{
305 UV len = get_length (); 312 UV len = get_length ();
306 313
307 if (!len) 314 if (!len)
308 {
309 error ("invalid integer length equal to zero"); 315 error ("invalid integer length equal to zero (X.690 8.3.1)");
310 return 0;
311 }
312 316
313 U8 *data = get_n (len); 317 U8 *data = get_n (len);
318
319 if (expect_false (len > 1))
320 {
321 U16 mask = (data [0] << 8) | data [1] & 0xff80;
322
323 if (expect_false (mask == 0xff80 || mask == 0x0000))
324 error ("illegal padding in integer (X.690 8.3.2)");
325 }
314 326
315 int negative = data [0] & 0x80; 327 int negative = data [0] & 0x80;
316 328
317 UV val = negative ? -1 : 0; // copy signbit to all bits 329 UV val = negative ? -1 : 0; // copy signbit to all bits
318 330
… …
382 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack 394 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
383 char *app = oid; 395 char *app = oid;
384 396
385 if (relative) 397 if (relative)
386 app = write_uv (app, w); 398 app = write_uv (app, w);
387 else 399 else if (w < 2 * 40)
388 { 400 {
389 app = write_uv (app, (U8)w / 40); 401 app = write_uv (app, (U8)w / 40);
390 *app++ = '.'; 402 *app++ = '.';
391 app = write_uv (app, (U8)w % 40); 403 app = write_uv (app, (U8)w % 40);
404 }
405 else
406 {
407 app = write_uv (app, 2);
408 *app++ = '.';
409 app = write_uv (app, w - 2 * 40);
392 } 410 }
393 411
394 while (cur < end) 412 while (cur < end)
395 { 413 {
396 // we assume an oid component is never > 64 digits 414 // we assume an oid component is never > 64 digits
… …
453 int tag = identifier & ASN_TAG_MASK; 471 int tag = identifier & ASN_TAG_MASK;
454 472
455 if (tag == ASN_TAG_BER) 473 if (tag == ASN_TAG_BER)
456 tag = get_w (); 474 tag = get_w ();
457 475
458 if (tag == ASN_TAG_BER)
459 tag = get_w ();
460
461 if (constructed) 476 if (constructed)
462 { 477 {
463 UV len = get_length (); 478 UV len = get_length ();
464 UV seqend = (cur - buf) + len; 479 UV seqend = (cur - buf) + len;
465 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 480 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
466 481
467 while (cur < buf + seqend) 482 while (cur < buf + seqend)
468 av_push (av, decode_ber ()); 483 av_push (av, decode_ber ());
469 484
470 if (cur > buf + seqend) 485 if (cur > buf + seqend)
471 croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend); 486 croak ("constructed type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
472 487
473 res = newRV_inc ((SV *)av); 488 res = newRV_inc ((SV *)av);
474 } 489 }
475 else 490 else
476 switch (profile_lookup (cur_profile, klass, tag)) 491 switch (profile_lookup (cur_profile, klass, tag))
… …
478 case BER_TYPE_NULL: 493 case BER_TYPE_NULL:
479 { 494 {
480 UV len = get_length (); 495 UV len = get_length ();
481 496
482 if (len) 497 if (len)
483 croak ("BER_TYPE_NULL value with non-zero length %d encountered", len); 498 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
484 499
485 res = &PL_sv_undef; 500 res = &PL_sv_undef;
486 } 501 }
487 break; 502 break;
488 503
489 case BER_TYPE_BOOL: 504 case BER_TYPE_BOOL:
490 { 505 {
491 UV len = get_length (); 506 UV len = get_length ();
492 507
493 if (len != 1) 508 if (len != 1)
494 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len); 509 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
495 510
496 res = newSVcacheint (!!get_u8 ()); 511 res = newSVcacheint (!!get_u8 ());
497 } 512 }
498 break; 513 break;
499 514
… …
521 case BER_TYPE_IPADDRESS: 536 case BER_TYPE_IPADDRESS:
522 { 537 {
523 UV len = get_length (); 538 UV len = get_length ();
524 539
525 if (len != 4) 540 if (len != 4)
526 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 541 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
527 542
528 U8 c1 = get_u8 (); 543 U8 c1 = get_u8 ();
529 U8 c2 = get_u8 (); 544 U8 c2 = get_u8 ();
530 U8 c3 = get_u8 (); 545 U8 c3 = get_u8 ();
531 U8 c4 = get_u8 (); 546 U8 c4 = get_u8 ();
… …
566strlen_sum (STRLEN l1, STRLEN l2) 581strlen_sum (STRLEN l1, STRLEN l2)
567{ 582{
568 size_t sum = l1 + l2; 583 size_t sum = l1 + l2;
569 584
570 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 585 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
571 croak ("JSON::XS: string size overflow"); 586 croak ("Convert::BER::XS: string size overflow");
572 587
573 return sum; 588 return sum;
574} 589}
575 590
576static void 591static void
… …
1055 const_iv (BER_TYPE_IPADDRESS) 1070 const_iv (BER_TYPE_IPADDRESS)
1056 const_iv (BER_TYPE_CROAK) 1071 const_iv (BER_TYPE_CROAK)
1057 1072
1058 const_iv (SNMP_IPADDRESS) 1073 const_iv (SNMP_IPADDRESS)
1059 const_iv (SNMP_COUNTER32) 1074 const_iv (SNMP_COUNTER32)
1075 const_iv (SNMP_GAUGE32)
1060 const_iv (SNMP_UNSIGNED32) 1076 const_iv (SNMP_UNSIGNED32)
1061 const_iv (SNMP_TIMETICKS) 1077 const_iv (SNMP_TIMETICKS)
1062 const_iv (SNMP_OPAQUE) 1078 const_iv (SNMP_OPAQUE)
1063 const_iv (SNMP_COUNTER64) 1079 const_iv (SNMP_COUNTER64)
1064 }; 1080 };

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines