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.6 by root, Sat Apr 20 01:03:59 2019 UTC vs.
Revision 1.8 by root, Sat Apr 20 01:50:13 2019 UTC

… …
10 ASN_INTEGER32 = 0x02, 10 ASN_INTEGER32 = 0x02,
11 ASN_BIT_STRING = 0x03, 11 ASN_BIT_STRING = 0x03,
12 ASN_OCTET_STRING = 0x04, 12 ASN_OCTET_STRING = 0x04,
13 ASN_NULL = 0x05, 13 ASN_NULL = 0x05,
14 ASN_OBJECT_IDENTIFIER = 0x06, 14 ASN_OBJECT_IDENTIFIER = 0x06,
15 ASN_OID = 0x06, //X 15 ASN_OID = 0x06,
16 ASN_OBJECT_DESCRIPTOR = 0x07, //X 16 ASN_OBJECT_DESCRIPTOR = 0x07,
17 ASN_EXTERNAL = 0x08, //X 17 ASN_EXTERNAL = 0x08,
18 ASN_REAL = 0x09, //X 18 ASN_REAL = 0x09,
19 ASN_ENUMERATED = 0x0a, //X 19 ASN_ENUMERATED = 0x0a,
20 ASN_EMBEDDED_PDV = 0x0b, //X 20 ASN_EMBEDDED_PDV = 0x0b,
21 ASN_UTF8_STRING = 0x0c, //X 21 ASN_UTF8_STRING = 0x0c,
22 ASN_RELATIVE_OID = 0x0d, //X 22 ASN_RELATIVE_OID = 0x0d,
23 ASN_SEQUENCE = 0x10, 23 ASN_SEQUENCE = 0x10,
24 ASN_SET = 0x11, //X 24 ASN_SET = 0x11,
25 ASN_NUMERIC_STRING = 0x12, //X 25 ASN_NUMERIC_STRING = 0x12,
26 ASN_PRINTABLE_STRING = 0x13, //X 26 ASN_PRINTABLE_STRING = 0x13,
27 ASN_TELETEX_STRING = 0x14, //X 27 ASN_TELETEX_STRING = 0x14,
28 ASN_T61_STRING = 0x14, //X 28 ASN_T61_STRING = 0x14,
29 ASN_VIDEOTEX_STRING = 0x15, //X 29 ASN_VIDEOTEX_STRING = 0x15,
30 ASN_IA5_STRING = 0x16, //X 30 ASN_IA5_STRING = 0x16,
31 ASN_ASCII_STRING = 0x16, //X 31 ASN_ASCII_STRING = 0x16,
32 ASN_UTC_TIME = 0x17, //X 32 ASN_UTC_TIME = 0x17,
33 ASN_GENERALIZED_TIME = 0x18, //X 33 ASN_GENERALIZED_TIME = 0x18,
34 ASN_GRAPHIC_STRING = 0x19, //X 34 ASN_GRAPHIC_STRING = 0x19,
35 ASN_VISIBLE_STRING = 0x1a, //X 35 ASN_VISIBLE_STRING = 0x1a,
36 ASN_ISO646_STRING = 0x1a, //X 36 ASN_ISO646_STRING = 0x1a,
37 ASN_GENERAL_STRING = 0x1b, //X 37 ASN_GENERAL_STRING = 0x1b,
38 ASN_UNIVERSAL_STRING = 0x1c, //X 38 ASN_UNIVERSAL_STRING = 0x1c,
39 ASN_CHARACTER_STRING = 0x1d, //X 39 ASN_CHARACTER_STRING = 0x1d,
40 ASN_BMP_STRING = 0x1e, //X 40 ASN_BMP_STRING = 0x1e,
41 41
42 ASN_TAG_BER = 0x1f, 42 ASN_TAG_BER = 0x1f,
43 ASN_TAG_MASK = 0x1f, 43 ASN_TAG_MASK = 0x1f,
44 44
45 // primitive/constructed 45 // primitive/constructed
… …
387 } 387 }
388 388
389 return newSVpvn (oid, app - oid); 389 return newSVpvn (oid, app - oid);
390} 390}
391 391
392// TODO: this is unacceptably slow
393static SV *
394decode_ucs (int chrsize)
395{
396 SV *res = NEWSV (0, 0);
397
398 U32 len = get_length ();
399
400 if (len & (chrsize - 1))
401 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
402
403 while (len)
404 {
405 U8 b1 = get_u8 ();
406 U8 b2 = get_u8 ();
407 U32 chr = (b1 << 8) | b2;
408
409 if (chrsize == 4)
410 {
411 U8 b3 = get_u8 ();
412 U8 b4 = get_u8 ();
413 chr = (chr << 16) | (b3 << 8) | b4;
414 }
415
416 U8 uchr [UTF8_MAXBYTES];
417 int uclen = uvuni_to_utf8 (uchr, chr) - uchr;
418
419 sv_catpvn (res, (const char *)uchr, uclen);
420 len -= chrsize;
421 }
422
423 SvUTF8_on (res);
424
425 return res;
426}
427
392static SV * 428static SV *
393decode_ber () 429decode_ber ()
394{ 430{
395 int identifier = get_u8 (); 431 int identifier = get_u8 ();
396 432
… …
473 509
474 res = newSVpvf ("%d.%d.%d.%d", c1, c2, c3, c4); 510 res = newSVpvf ("%d.%d.%d.%d", c1, c2, c3, c4);
475 } 511 }
476 break; 512 break;
477 513
514 case BER_TYPE_UCS2:
515 res = decode_ucs (2);
516 break;
517
518 case BER_TYPE_UCS4:
519 res = decode_ucs (4);
520 break;
521
478 case BER_TYPE_REAL: 522 case BER_TYPE_REAL:
479 case BER_TYPE_UCS2:
480 case BER_TYPE_UCS4:
481 case BER_TYPE_CROAK: 523 case BER_TYPE_CROAK:
482 default: 524 default:
483 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 525 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
484 } 526 }
485 527
… …
589} 631}
590 632
591static void 633static void
592put_length (U32 val) 634put_length (U32 val)
593{ 635{
594 need (5); 636 need (5 + val);
595 cur = put_length_at (val, cur); 637 cur = put_length_at (val, cur);
596} 638}
597 639
598// return how many bytes the encoded length requires 640// return how many bytes the encoded length requires
599static int length_length (U32 val) 641static int length_length (U32 val)
… …
605 647
606static void 648static void
607encode_data (const char *ptr, STRLEN len) 649encode_data (const char *ptr, STRLEN len)
608{ 650{
609 put_length (len); 651 put_length (len);
610 need (len);
611 memcpy (cur, ptr, len); 652 memcpy (cur, ptr, len);
612 cur += len; 653 cur += len;
613} 654}
614 655
615static void 656static void
… …
761 802
762 return (AV *)rv; 803 return (AV *)rv;
763} 804}
764 805
765static void 806static void
807encode_ucs (SV *data, int chrsize)
808{
809 STRLEN uchars = sv_len_utf8 (data);
810 STRLEN len;;
811 char *ptr = SvPVutf8 (data, len);
812
813 put_length (uchars * chrsize);
814
815 while (uchars--)
816 {
817 STRLEN uclen;
818 UV uchr = utf8_to_uvchr_buf (ptr, ptr + len, &uclen);
819
820 ptr += uclen;
821 len -= uclen;
822
823 if (chrsize == 4)
824 {
825 *cur++ = uchr >> 24;
826 *cur++ = uchr >> 16;
827 }
828
829 *cur++ = uchr >> 8;
830 *cur++ = uchr;
831 }
832}
833static void
766encode_ber (SV *tuple) 834encode_ber (SV *tuple)
767{ 835{
768 AV *av = ber_tuple (tuple); 836 AV *av = ber_tuple (tuple);
769 837
770 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 838 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
… …
810 put_length (0); 878 put_length (0);
811 break; 879 break;
812 880
813 case BER_TYPE_BOOL: 881 case BER_TYPE_BOOL:
814 put_length (1); 882 put_length (1);
815 put_u8 (SvTRUE (data) ? 0xff : 0x00); 883 *cur++ = SvTRUE (data) ? 0xff : 0x00;
816 break; 884 break;
817 885
818 case BER_TYPE_OID: 886 case BER_TYPE_OID:
819 encode_oid (data, 0); 887 encode_oid (data, 0);
820 break; 888 break;
… …
849 sscanf (SvPV_nolen (data), "%hhu.%hhu.%hhu.%hhu", ip + 0, ip + 1, ip + 2, ip + 3); 917 sscanf (SvPV_nolen (data), "%hhu.%hhu.%hhu.%hhu", ip + 0, ip + 1, ip + 2, ip + 3);
850 encode_data ((const char *)ip, sizeof (ip)); 918 encode_data ((const char *)ip, sizeof (ip));
851 } 919 }
852 break; 920 break;
853 921
922 case BER_TYPE_UCS2:
923 encode_ucs (data, 2);
924 break;
925
926 case BER_TYPE_UCS4:
927 encode_ucs (data, 4);
928 break;
929
854 case BER_TYPE_REAL: 930 case BER_TYPE_REAL:
855 case BER_TYPE_UCS2:
856 case BER_TYPE_UCS4:
857 case BER_TYPE_CROAK: 931 case BER_TYPE_CROAK:
858 default: 932 default:
859 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 933 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
860 } 934 }
861 935

Diff Legend

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