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.18 by root, Sat Apr 20 16:12:53 2019 UTC vs.
Revision 1.24 by root, Sun Apr 21 01:58:15 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 (); 265 if (expect_false (res >> UVSIZE * 8 - 7))
266 error ("BER variable integer overflow");
267
261 res = (res << 7) | (c & 0x7f); 268 res = (res << 7) | (c & 0x7f);
262 269
263 if (!(c & 0x80)) 270 if (!(c & 0x80))
264 return res; 271 return res;
272
273 c = get_u8 ();
265 } 274 }
266} 275}
267 276
268static UV 277static UV
269get_length (void) 278get_length (void)
… …
277 286
278 switch (cnt) 287 switch (cnt)
279 { 288 {
280 case 0: 289 case 0:
281 error ("indefinite ASN.1 lengths not supported"); 290 error ("indefinite ASN.1 lengths not supported");
282 return 0;
283 291
284 //case 0x80: // indefinite length 292 case 0x7f:
293 error ("ASN.1 reserved value in length (X.690 8.1.3.5)");
285 294
286 //case 0xff: reserved
287 default: 295 default:
288 error ("ASN.1 length too long"); 296 error ("ASN.1 length too long (only up to 2**64 octets supported)");
289 return 0;
290 297
291 case 8: res = (res << 8) | get_u8 (); 298 case 8: res = (res << 8) | get_u8 ();
292 case 7: res = (res << 8) | get_u8 (); 299 case 7: res = (res << 8) | get_u8 ();
293 case 6: res = (res << 8) | get_u8 (); 300 case 6: res = (res << 8) | get_u8 ();
294 case 5: res = (res << 8) | get_u8 (); 301 case 5: res = (res << 8) | get_u8 ();
… …
306decode_int (void) 313decode_int (void)
307{ 314{
308 UV len = get_length (); 315 UV len = get_length ();
309 316
310 if (!len) 317 if (!len)
311 {
312 error ("invalid integer length equal to zero"); 318 error ("invalid integer length equal to zero (X.690 8.3.1)");
313 return 0;
314 }
315 319
316 U8 *data = get_n (len); 320 U8 *data = get_n (len);
317 321
322 if (expect_false (len > 1))
323 {
324 U16 mask = (data [0] << 8) | data [1] & 0xff80;
325
326 if (expect_false (mask == 0xff80 || mask == 0x0000))
327 error ("illegal padding in integer (X.690 8.3.2)");
328 }
329
318 int negative = data [0] & 0x80; 330 int negative = data [0] & 0x80;
319 331
320 UV val = negative ? -1 : 0; // copy signbit to all bits 332 UV val = negative ? -1 : 0; // copy signbit to all bits
333
334 if (len > UVSIZE + (!negative && !*data))
335 error ("INTEGER overflow");
321 336
322 do 337 do
323 val = (val << 8) | *data++; 338 val = (val << 8) | *data++;
324 while (--len); 339 while (--len);
325 340
… …
380 } 395 }
381 396
382 U8 *end = cur + len; 397 U8 *end = cur + len;
383 UV w = get_w (); 398 UV w = get_w ();
384 399
385 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack 400 static char oid[MAX_OID_STRLEN]; // static, because too large for stack
386 char *app = oid; 401 char *app = oid;
387 402
388 if (relative) 403 if (relative)
389 app = write_uv (app, w); 404 app = write_uv (app, w);
390 else if (w < 2 * 40) 405 else if (w < 2 * 40)
… …
462 int tag = identifier & ASN_TAG_MASK; 477 int tag = identifier & ASN_TAG_MASK;
463 478
464 if (tag == ASN_TAG_BER) 479 if (tag == ASN_TAG_BER)
465 tag = get_w (); 480 tag = get_w ();
466 481
467 if (tag == ASN_TAG_BER)
468 tag = get_w ();
469
470 if (constructed) 482 if (constructed)
471 { 483 {
472 UV len = get_length (); 484 UV len = get_length ();
473 UV seqend = (cur - buf) + len; 485 UV seqend = (cur - buf) + len;
474 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 486 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
475 487
476 while (cur < buf + seqend) 488 while (cur < buf + seqend)
477 av_push (av, decode_ber ()); 489 av_push (av, decode_ber ());
478 490
479 if (cur > buf + seqend) 491 if (cur > buf + seqend)
480 croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend); 492 croak ("constructed type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
481 493
482 res = newRV_inc ((SV *)av); 494 res = newRV_inc ((SV *)av);
483 } 495 }
484 else 496 else
485 switch (profile_lookup (cur_profile, klass, tag)) 497 switch (profile_lookup (cur_profile, klass, tag))
… …
487 case BER_TYPE_NULL: 499 case BER_TYPE_NULL:
488 { 500 {
489 UV len = get_length (); 501 UV len = get_length ();
490 502
491 if (len) 503 if (len)
492 croak ("BER_TYPE_NULL value with non-zero length %d encountered", len); 504 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
493 505
494 res = &PL_sv_undef; 506 res = &PL_sv_undef;
495 } 507 }
496 break; 508 break;
497 509
498 case BER_TYPE_BOOL: 510 case BER_TYPE_BOOL:
499 { 511 {
500 UV len = get_length (); 512 UV len = get_length ();
501 513
502 if (len != 1) 514 if (len != 1)
503 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len); 515 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
504 516
505 res = newSVcacheint (!!get_u8 ()); 517 res = newSVcacheint (!!get_u8 ());
506 } 518 }
507 break; 519 break;
508 520
… …
530 case BER_TYPE_IPADDRESS: 542 case BER_TYPE_IPADDRESS:
531 { 543 {
532 UV len = get_length (); 544 UV len = get_length ();
533 545
534 if (len != 4) 546 if (len != 4)
535 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 547 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
536 548
537 U8 c1 = get_u8 (); 549 U8 c1 = get_u8 ();
538 U8 c2 = get_u8 (); 550 U8 c2 = get_u8 ();
539 U8 c3 = get_u8 (); 551 U8 c3 = get_u8 ();
540 U8 c4 = get_u8 (); 552 U8 c4 = get_u8 ();
… …
575strlen_sum (STRLEN l1, STRLEN l2) 587strlen_sum (STRLEN l1, STRLEN l2)
576{ 588{
577 size_t sum = l1 + l2; 589 size_t sum = l1 + l2;
578 590
579 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 591 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
580 croak ("JSON::XS: string size overflow"); 592 croak ("Convert::BER::XS: string size overflow");
581 593
582 return sum; 594 return sum;
583} 595}
584 596
585static void 597static void
… …
1064 const_iv (BER_TYPE_IPADDRESS) 1076 const_iv (BER_TYPE_IPADDRESS)
1065 const_iv (BER_TYPE_CROAK) 1077 const_iv (BER_TYPE_CROAK)
1066 1078
1067 const_iv (SNMP_IPADDRESS) 1079 const_iv (SNMP_IPADDRESS)
1068 const_iv (SNMP_COUNTER32) 1080 const_iv (SNMP_COUNTER32)
1081 const_iv (SNMP_GAUGE32)
1069 const_iv (SNMP_UNSIGNED32) 1082 const_iv (SNMP_UNSIGNED32)
1070 const_iv (SNMP_TIMETICKS) 1083 const_iv (SNMP_TIMETICKS)
1071 const_iv (SNMP_OPAQUE) 1084 const_iv (SNMP_OPAQUE)
1072 const_iv (SNMP_COUNTER64) 1085 const_iv (SNMP_COUNTER64)
1073 }; 1086 };
1074 1087
1075 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1088 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
1076 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1089 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1077} 1090}
1078 1091
1079SV * 1092void
1080ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1093ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1094 ALIAS:
1095 ber_decode_prefix = 1
1081 CODE: 1096 PPCODE:
1082{ 1097{
1083 cur_profile = SvPROFILE (profile); 1098 cur_profile = SvPROFILE (profile);
1084 STRLEN len; 1099 STRLEN len;
1085 buf = (U8 *)SvPVbyte (ber, len); 1100 buf = (U8 *)SvPVbyte (ber, len);
1086 cur = buf; 1101 cur = buf;
1087 end = buf + len; 1102 end = buf + len;
1088 1103
1089 RETVAL = decode_ber (); 1104 SV *tuple = decode_ber ();
1105
1106 EXTEND (SP, 2);
1107 PUSHs (sv_2mortal (tuple));
1108
1109 if (ix)
1110 PUSHs (sv_2mortal (newSViv (cur - buf)));
1111 else if (cur != end)
1112 error ("trailing garbage after BER data");
1090} 1113}
1091 OUTPUT: RETVAL
1092 1114
1093void 1115void
1094ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *flags = &PL_sv_undef, SV *data = &PL_sv_undef) 1116ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *flags = &PL_sv_undef, SV *data = &PL_sv_undef)
1095 PPCODE: 1117 PPCODE:
1096{ 1118{

Diff Legend

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