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.19 by root, Sat Apr 20 16:34:34 2019 UTC vs.
Revision 1.22 by root, Sat Apr 20 18:38:33 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;
265 }
266}
267 269
268// get_w, but disallow padding 270 c = get_u8 ();
269static UV 271 }
270get_w_nopad (void)
271{
272 U8 first = get_u8 ();
273
274 if (first == 0x80)
275 error ("illegal BER padding");
276
277 --cur;
278
279 return get_w ();
280} 272}
281 273
282static UV 274static UV
283get_length (void) 275get_length (void)
284{ 276{
… …
291 283
292 switch (cnt) 284 switch (cnt)
293 { 285 {
294 case 0: 286 case 0:
295 error ("indefinite ASN.1 lengths not supported"); 287 error ("indefinite ASN.1 lengths not supported");
296 return 0;
297 288
298 //case 0x80: // indefinite length 289 case 0x7f:
290 error ("ASN.1 reserved value in length (X.690 8.1.3.5)");
299 291
300 //case 0xff: reserved
301 default: 292 default:
302 error ("ASN.1 length too long"); 293 error ("ASN.1 length too long (only up to 2**64 octets supported)");
303 return 0;
304 294
305 case 8: res = (res << 8) | get_u8 (); 295 case 8: res = (res << 8) | get_u8 ();
306 case 7: res = (res << 8) | get_u8 (); 296 case 7: res = (res << 8) | get_u8 ();
307 case 6: res = (res << 8) | get_u8 (); 297 case 6: res = (res << 8) | get_u8 ();
308 case 5: res = (res << 8) | get_u8 (); 298 case 5: res = (res << 8) | get_u8 ();
… …
320decode_int (void) 310decode_int (void)
321{ 311{
322 UV len = get_length (); 312 UV len = get_length ();
323 313
324 if (!len) 314 if (!len)
325 {
326 error ("invalid integer length equal to zero"); 315 error ("invalid integer length equal to zero (X.690 8.3.1)");
327 return 0;
328 }
329 316
330 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 }
331 326
332 int negative = data [0] & 0x80; 327 int negative = data [0] & 0x80;
333 328
334 UV val = negative ? -1 : 0; // copy signbit to all bits 329 UV val = negative ? -1 : 0; // copy signbit to all bits
335 330
… …
392 error ("OBJECT IDENTIFIER length equal to zero"); 387 error ("OBJECT IDENTIFIER length equal to zero");
393 return &PL_sv_undef; 388 return &PL_sv_undef;
394 } 389 }
395 390
396 U8 *end = cur + len; 391 U8 *end = cur + len;
397 UV w = get_w_nopad (); 392 UV w = get_w ();
398 393
399 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
400 char *app = oid; 395 char *app = oid;
401 396
402 if (relative) 397 if (relative)
… …
418 { 413 {
419 // we assume an oid component is never > 64 digits 414 // we assume an oid component is never > 64 digits
420 if (oid + sizeof (oid) - app < 64) 415 if (oid + sizeof (oid) - app < 64)
421 croak ("BER_TYPE_OID to long to decode"); 416 croak ("BER_TYPE_OID to long to decode");
422 417
423 w = get_w_nopad (); 418 w = get_w ();
424 *app++ = '.'; 419 *app++ = '.';
425 app = write_uv (app, w); 420 app = write_uv (app, w);
426 } 421 }
427 422
428 return newSVpvn (oid, app - oid); 423 return newSVpvn (oid, app - oid);
… …
476 int tag = identifier & ASN_TAG_MASK; 471 int tag = identifier & ASN_TAG_MASK;
477 472
478 if (tag == ASN_TAG_BER) 473 if (tag == ASN_TAG_BER)
479 tag = get_w (); 474 tag = get_w ();
480 475
481 if (tag == ASN_TAG_BER)
482 tag = get_w ();
483
484 if (constructed) 476 if (constructed)
485 { 477 {
486 UV len = get_length (); 478 UV len = get_length ();
487 UV seqend = (cur - buf) + len; 479 UV seqend = (cur - buf) + len;
488 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 480 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
489 481
490 while (cur < buf + seqend) 482 while (cur < buf + seqend)
491 av_push (av, decode_ber ()); 483 av_push (av, decode_ber ());
492 484
493 if (cur > buf + seqend) 485 if (cur > buf + seqend)
494 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);
495 487
496 res = newRV_inc ((SV *)av); 488 res = newRV_inc ((SV *)av);
497 } 489 }
498 else 490 else
499 switch (profile_lookup (cur_profile, klass, tag)) 491 switch (profile_lookup (cur_profile, klass, tag))
… …
501 case BER_TYPE_NULL: 493 case BER_TYPE_NULL:
502 { 494 {
503 UV len = get_length (); 495 UV len = get_length ();
504 496
505 if (len) 497 if (len)
506 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);
507 499
508 res = &PL_sv_undef; 500 res = &PL_sv_undef;
509 } 501 }
510 break; 502 break;
511 503
512 case BER_TYPE_BOOL: 504 case BER_TYPE_BOOL:
513 { 505 {
514 UV len = get_length (); 506 UV len = get_length ();
515 507
516 if (len != 1) 508 if (len != 1)
517 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);
518 510
519 res = newSVcacheint (!!get_u8 ()); 511 res = newSVcacheint (!!get_u8 ());
520 } 512 }
521 break; 513 break;
522 514
… …
544 case BER_TYPE_IPADDRESS: 536 case BER_TYPE_IPADDRESS:
545 { 537 {
546 UV len = get_length (); 538 UV len = get_length ();
547 539
548 if (len != 4) 540 if (len != 4)
549 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);
550 542
551 U8 c1 = get_u8 (); 543 U8 c1 = get_u8 ();
552 U8 c2 = get_u8 (); 544 U8 c2 = get_u8 ();
553 U8 c3 = get_u8 (); 545 U8 c3 = get_u8 ();
554 U8 c4 = get_u8 (); 546 U8 c4 = get_u8 ();
… …
589strlen_sum (STRLEN l1, STRLEN l2) 581strlen_sum (STRLEN l1, STRLEN l2)
590{ 582{
591 size_t sum = l1 + l2; 583 size_t sum = l1 + l2;
592 584
593 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 585 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
594 croak ("JSON::XS: string size overflow"); 586 croak ("Convert::BER::XS: string size overflow");
595 587
596 return sum; 588 return sum;
597} 589}
598 590
599static void 591static void
… …
1078 const_iv (BER_TYPE_IPADDRESS) 1070 const_iv (BER_TYPE_IPADDRESS)
1079 const_iv (BER_TYPE_CROAK) 1071 const_iv (BER_TYPE_CROAK)
1080 1072
1081 const_iv (SNMP_IPADDRESS) 1073 const_iv (SNMP_IPADDRESS)
1082 const_iv (SNMP_COUNTER32) 1074 const_iv (SNMP_COUNTER32)
1075 const_iv (SNMP_GAUGE32)
1083 const_iv (SNMP_UNSIGNED32) 1076 const_iv (SNMP_UNSIGNED32)
1084 const_iv (SNMP_TIMETICKS) 1077 const_iv (SNMP_TIMETICKS)
1085 const_iv (SNMP_OPAQUE) 1078 const_iv (SNMP_OPAQUE)
1086 const_iv (SNMP_COUNTER64) 1079 const_iv (SNMP_COUNTER64)
1087 }; 1080 };
1088 1081
1089 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1082 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
1090 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1083 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1091} 1084}
1092 1085
1093SV * 1086void
1094ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1087ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1088 ALIAS:
1089 ber_decode_prefix = 1
1095 CODE: 1090 PPCODE:
1096{ 1091{
1097 cur_profile = SvPROFILE (profile); 1092 cur_profile = SvPROFILE (profile);
1098 STRLEN len; 1093 STRLEN len;
1099 buf = (U8 *)SvPVbyte (ber, len); 1094 buf = (U8 *)SvPVbyte (ber, len);
1100 cur = buf; 1095 cur = buf;
1101 end = buf + len; 1096 end = buf + len;
1102 1097
1103 RETVAL = decode_ber (); 1098 SV *tuple = decode_ber ();
1099
1100 EXTEND (SP, 2);
1101 PUSHs (sv_2mortal (tuple));
1102
1103 if (ix)
1104 PUSHs (sv_2mortal (newSViv (cur - buf)));
1105 else if (cur != end)
1106 error ("trailing garbage after BER data");
1104} 1107}
1105 OUTPUT: RETVAL
1106 1108
1107void 1109void
1108ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *flags = &PL_sv_undef, SV *data = &PL_sv_undef) 1110ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *flags = &PL_sv_undef, SV *data = &PL_sv_undef)
1109 PPCODE: 1111 PPCODE:
1110{ 1112{

Diff Legend

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