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.5 by root, Fri Apr 19 23:50:53 2019 UTC vs.
Revision 1.9 by root, Sat Apr 20 02:12:27 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
… …
72 BER_TYPE_OID, 72 BER_TYPE_OID,
73 BER_TYPE_RELOID, 73 BER_TYPE_RELOID,
74 BER_TYPE_NULL, 74 BER_TYPE_NULL,
75 BER_TYPE_BOOL, 75 BER_TYPE_BOOL,
76 BER_TYPE_REAL, 76 BER_TYPE_REAL,
77 BER_TYPE_IPADDRESS,
77 BER_TYPE_CROAK, 78 BER_TYPE_CROAK,
78}; 79};
79 80
80enum { 81enum {
81 BER_CLASS = 0, 82 BER_CLASS = 0,
… …
91 92
92static profile_type *cur_profile, *default_profile; 93static profile_type *cur_profile, *default_profile;
93static SV *buf_sv; // encoding buffer 94static SV *buf_sv; // encoding buffer
94static U8 *buf, *cur, *end; // buffer start, current, end 95static U8 *buf, *cur, *end; // buffer start, current, end
95 96
97#if PERL_VERSION < 18
98# define utf8_to_uvchr_buf(s,e,l) utf8_to_uvchr (s, l)
99#endif
100
96#if __GNUC__ >= 3 101#if __GNUC__ >= 3
97# define expect(expr,value) __builtin_expect ((expr), (value)) 102# define expect(expr,value) __builtin_expect ((expr), (value))
98# define INLINE static inline 103# define INLINE static inline
99#else 104#else
100# define expect(expr,value) (expr) 105# define expect(expr,value) (expr)
… …
129 134
130static profile_type * 135static profile_type *
131SvPROFILE (SV *profile) 136SvPROFILE (SV *profile)
132{ 137{
133 if (!SvOK (profile)) 138 if (!SvOK (profile))
134 profile = default_profile; 139 return default_profile;
135 140
136 if (!SvROK (profile)) 141 if (!SvROK (profile))
137 croak ("invalid profile"); 142 croak ("invalid profile");
138 143
139 profile = SvRV (profile); 144 profile = SvRV (profile);
… …
194 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 }, 199 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
195 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 }, 200 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
196 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 }, 201 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
197 }; 202 };
198 203
199 //const_iv (SNMP_IPADDRESS)
200 //const_iv (SNMP_COUNTER32)
201 //const_iv (SNMP_UNSIGNED32)
202 //const_iv (SNMP_TIMETICKS)
203 //const_iv (SNMP_OPAQUE)
204 //const_iv (SNMP_COUNTER64)
205
206 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem > default_map; celem--) 204 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem > default_map; celem--)
207 profile_set ((void *)sv, celem->klass, celem->tag, celem->type); 205 profile_set ((void *)sv, celem->klass, celem->tag, celem->type);
208 206
209 return sv_bless (newRV_noinc (sv), profile_stash); 207 return sv_bless (newRV_noinc (sv), profile_stash);
210} 208}
… …
313 311
314 do 312 do
315 val = (val << 8) | *data++; 313 val = (val << 8) | *data++;
316 while (--len); 314 while (--len);
317 315
318 // the cats to IV relies on implementation-defined behaviour (two's complement cast) 316 // the cast to IV relies on implementation-defined behaviour (two's complement cast)
319 // but that's ok, as perl relies on it as well. 317 // but that's ok, as perl relies on it as well.
320 return negative ? newSViv ((IV)val) : newSVuv (val); 318 return negative ? newSViv ((IV)val) : newSVuv (val);
321} 319}
322 320
323static SV * 321static SV *
… …
393 } 391 }
394 392
395 return newSVpvn (oid, app - oid); 393 return newSVpvn (oid, app - oid);
396} 394}
397 395
396// TODO: this is unacceptably slow
397static SV *
398decode_ucs (int chrsize)
399{
400 SV *res = NEWSV (0, 0);
401
402 U32 len = get_length ();
403
404 if (len & (chrsize - 1))
405 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
406
407 while (len)
408 {
409 U8 b1 = get_u8 ();
410 U8 b2 = get_u8 ();
411 U32 chr = (b1 << 8) | b2;
412
413 if (chrsize == 4)
414 {
415 U8 b3 = get_u8 ();
416 U8 b4 = get_u8 ();
417 chr = (chr << 16) | (b3 << 8) | b4;
418 }
419
420 U8 uchr [UTF8_MAXBYTES];
421 int uclen = uvuni_to_utf8 (uchr, chr) - uchr;
422
423 sv_catpvn (res, (const char *)uchr, uclen);
424 len -= chrsize;
425 }
426
427 SvUTF8_on (res);
428
429 return res;
430}
431
398static SV * 432static SV *
399decode_ber () 433decode_ber ()
400{ 434{
401 int identifier = get_u8 (); 435 int identifier = get_u8 ();
402 436
… …
436 case BER_TYPE_BOOL: 470 case BER_TYPE_BOOL:
437 { 471 {
438 U32 len = get_length (); 472 U32 len = get_length ();
439 473
440 if (len != 1) 474 if (len != 1)
441 croak ("BOOLEAN type with invalid length %d encountered", len); 475 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len);
442 476
443 res = newSVcacheint (get_u8 () ? 0 : 1); 477 res = newSVcacheint (get_u8 () ? 0 : 1);
444 } 478 }
445 break; 479 break;
446 480
… …
463 497
464 case BER_TYPE_BYTES: 498 case BER_TYPE_BYTES:
465 res = decode_data (); 499 res = decode_data ();
466 break; 500 break;
467 501
502 case BER_TYPE_IPADDRESS:
503 {
504 U32 len = get_length ();
505
506 if (len != 4)
507 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len);
508
509 U8 c1 = get_u8 ();
510 U8 c2 = get_u8 ();
511 U8 c3 = get_u8 ();
512 U8 c4 = get_u8 ();
513
514 res = newSVpvf ("%d.%d.%d.%d", c1, c2, c3, c4);
515 }
516 break;
517
518 case BER_TYPE_UCS2:
519 res = decode_ucs (2);
520 break;
521
522 case BER_TYPE_UCS4:
523 res = decode_ucs (4);
524 break;
525
468 case BER_TYPE_REAL: 526 case BER_TYPE_REAL:
469 case BER_TYPE_UCS2:
470 case BER_TYPE_UCS4:
471 case BER_TYPE_CROAK: 527 case BER_TYPE_CROAK:
472 default: 528 default:
473 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 529 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
474 } 530 }
475 531
… …
579} 635}
580 636
581static void 637static void
582put_length (U32 val) 638put_length (U32 val)
583{ 639{
584 need (5); 640 need (5 + val);
585 cur = put_length_at (val, cur); 641 cur = put_length_at (val, cur);
586} 642}
587 643
588// return how many bytes the encoded length requires 644// return how many bytes the encoded length requires
589static int length_length (U32 val) 645static int length_length (U32 val)
… …
595 651
596static void 652static void
597encode_data (const char *ptr, STRLEN len) 653encode_data (const char *ptr, STRLEN len)
598{ 654{
599 put_length (len); 655 put_length (len);
600 need (len);
601 memcpy (cur, ptr, len); 656 memcpy (cur, ptr, len);
602 cur += len; 657 cur += len;
603} 658}
604 659
605static void 660static void
… …
751 806
752 return (AV *)rv; 807 return (AV *)rv;
753} 808}
754 809
755static void 810static void
811encode_ucs (SV *data, int chrsize)
812{
813 STRLEN uchars = sv_len_utf8 (data);
814 STRLEN len;;
815 char *ptr = SvPVutf8 (data, len);
816
817 put_length (uchars * chrsize);
818
819 while (uchars--)
820 {
821 STRLEN uclen;
822 UV uchr = utf8_to_uvchr_buf (ptr, ptr + len, &uclen);
823
824 ptr += uclen;
825 len -= uclen;
826
827 if (chrsize == 4)
828 {
829 *cur++ = uchr >> 24;
830 *cur++ = uchr >> 16;
831 }
832
833 *cur++ = uchr >> 8;
834 *cur++ = uchr;
835 }
836}
837static void
756encode_ber (SV *tuple) 838encode_ber (SV *tuple)
757{ 839{
758 AV *av = ber_tuple (tuple); 840 AV *av = ber_tuple (tuple);
759 841
760 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 842 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
… …
800 put_length (0); 882 put_length (0);
801 break; 883 break;
802 884
803 case BER_TYPE_BOOL: 885 case BER_TYPE_BOOL:
804 put_length (1); 886 put_length (1);
805 put_u8 (SvTRUE (data) ? 0xff : 0x00); 887 *cur++ = SvTRUE (data) ? 0xff : 0x00;
806 break; 888 break;
807 889
808 case BER_TYPE_OID: 890 case BER_TYPE_OID:
809 encode_oid (data, 0); 891 encode_oid (data, 0);
810 break; 892 break;
… …
831 const char *ptr = SvPVutf8 (data, len); 913 const char *ptr = SvPVutf8 (data, len);
832 encode_data (ptr, len); 914 encode_data (ptr, len);
833 } 915 }
834 break; 916 break;
835 917
918 case BER_TYPE_IPADDRESS:
919 {
920 U8 ip[4];
921 sscanf (SvPV_nolen (data), "%hhu.%hhu.%hhu.%hhu", ip + 0, ip + 1, ip + 2, ip + 3);
922 encode_data ((const char *)ip, sizeof (ip));
923 }
924 break;
925
926 case BER_TYPE_UCS2:
927 encode_ucs (data, 2);
928 break;
929
930 case BER_TYPE_UCS4:
931 encode_ucs (data, 4);
932 break;
933
836 case BER_TYPE_REAL: 934 case BER_TYPE_REAL:
837 case BER_TYPE_UCS2:
838 case BER_TYPE_UCS4:
839 case BER_TYPE_CROAK: 935 case BER_TYPE_CROAK:
840 default: 936 default:
841 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 937 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
842 } 938 }
843 939
… …
911 const_iv (BER_TYPE_OID) 1007 const_iv (BER_TYPE_OID)
912 const_iv (BER_TYPE_RELOID) 1008 const_iv (BER_TYPE_RELOID)
913 const_iv (BER_TYPE_NULL) 1009 const_iv (BER_TYPE_NULL)
914 const_iv (BER_TYPE_BOOL) 1010 const_iv (BER_TYPE_BOOL)
915 const_iv (BER_TYPE_REAL) 1011 const_iv (BER_TYPE_REAL)
1012 const_iv (BER_TYPE_IPADDRESS)
916 const_iv (BER_TYPE_CROAK) 1013 const_iv (BER_TYPE_CROAK)
917 1014
918 const_iv (SNMP_IPADDRESS) 1015 const_iv (SNMP_IPADDRESS)
919 const_iv (SNMP_COUNTER32) 1016 const_iv (SNMP_COUNTER32)
920 const_iv (SNMP_UNSIGNED32) 1017 const_iv (SNMP_UNSIGNED32)
921 const_iv (SNMP_TIMETICKS) 1018 const_iv (SNMP_TIMETICKS)
922 const_iv (SNMP_OPAQUE) 1019 const_iv (SNMP_OPAQUE)
923 const_iv (SNMP_COUNTER64) 1020 const_iv (SNMP_COUNTER64)
924
925 }; 1021 };
926 1022
927 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1023 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
928 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1024 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
929
930 default_profile = profile_new ();
931} 1025}
932 1026
933SV * 1027SV *
934ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1028ber_decode (SV *ber, SV *profile = &PL_sv_undef)
935 CODE: 1029 CODE:
… …
1069new (SV *klass) 1163new (SV *klass)
1070 CODE: 1164 CODE:
1071 RETVAL = profile_new (); 1165 RETVAL = profile_new ();
1072 OUTPUT: RETVAL 1166 OUTPUT: RETVAL
1073 1167
1168void
1169set (SV *profile, int klass, int tag, int type)
1170 CODE:
1171 profile_set (SvPROFILE (profile), klass, tag, type);
1172
1173IV
1174get (SV *profile, int klass, int tag)
1175 CODE:
1176 RETVAL = profile_lookup (SvPROFILE (profile), klass, tag);
1177 OUTPUT: RETVAL
1178
1179void
1180_set_default (SV *profile)
1181 CODE:
1182 default_profile = SvPROFILE (profile);
1183
1184

Diff Legend

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