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.16 by root, Sat Apr 20 15:37:27 2019 UTC vs.
Revision 1.20 by root, Sat Apr 20 17:04:35 2019 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines