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.21 by root, Sat Apr 20 17:23:21 2019 UTC vs.
Revision 1.28 by root, Tue Apr 23 17:55:54 2019 UTC

… …
141{ 141{
142 if (!SvOK (profile)) 142 if (!SvOK (profile))
143 return default_profile; 143 return default_profile;
144 144
145 if (!SvROK (profile)) 145 if (!SvROK (profile))
146 croak ("invalid profile"); 146 croak ("Convert::BER::XS::Profile expected");
147 147
148 profile = SvRV (profile); 148 profile = SvRV (profile);
149 149
150 if (SvSTASH (profile) != profile_stash) 150 if (SvSTASH (profile) != profile_stash)
151 croak ("invalid profile object"); 151 croak ("Convert::BER::XS::Profile expected");
152 152
153 return (void *)profile; 153 return (void *)profile;
154} 154}
155 155
156static int 156static int
… …
228} 228}
229 229
230// get_* functions fetch something from the buffer 230// get_* functions fetch something from the buffer
231// decode_* functions use get_* fun ctions to decode ber values 231// decode_* functions use get_* fun ctions to decode ber values
232 232
233// get single octet
234static U8
235get_u8 (void)
236{
237 if (cur == end)
238 error ("unexpected end of message buffer");
239
240 return *cur++;
241}
242
233// get n octets 243// get n octets
234static U8 * 244static U8 *
235get_n (UV count) 245get_n (UV count)
236{ 246{
237 want (count); 247 want (count);
238 U8 *res = cur; 248 U8 *res = cur;
239 cur += count; 249 cur += count;
240 return res; 250 return res;
241} 251}
242 252
243// get single octet
244static U8
245get_u8 (void)
246{
247 if (cur == end)
248 error ("unexpected end of message buffer");
249
250 return *cur++;
251}
252
253// get ber-encoded integer (i.e. pack "w") 253// get ber-encoded integer (i.e. pack "w")
254static UV 254static UV
255get_w (void) 255get_w (void)
256{ 256{
257 UV res = 0; 257 UV res = 0;
… …
260 if (expect_false (c == 0x80)) 260 if (expect_false (c == 0x80))
261 error ("illegal BER padding (X.690 8.1.2.4.2, 8.19.2)"); 261 error ("illegal BER padding (X.690 8.1.2.4.2, 8.19.2)");
262 262
263 for (;;) 263 for (;;)
264 { 264 {
265 if (expect_false (res >> UVSIZE * 8 - 7))
266 error ("BER variable length integer overflow");
267
265 res = (res << 7) | (c & 0x7f); 268 res = (res << 7) | (c & 0x7f);
266 269
267 if (!(c & 0x80)) 270 if (!(c & 0x80))
268 return res; 271 return res;
269 272
… …
282 res = 0; 285 res = 0;
283 286
284 switch (cnt) 287 switch (cnt)
285 { 288 {
286 case 0: 289 case 0:
287 error ("indefinite ASN.1 lengths not supported"); 290 error ("indefinite BER value lengths not supported");
288 291
289 case 0x7f: 292 case 0x7f:
290 error ("ASN.1 reserved value in length (X.690 8.1.3.5)"); 293 error ("BER reserved value in length (X.690 8.1.3.5)");
291 294
292 default: 295 default:
293 error ("ASN.1 length too long (only up to 2**64 octets supported)"); 296 error ("BER value length too long (must fit into UV)");
294 297
298#if UVSIZE > 4
295 case 8: res = (res << 8) | get_u8 (); 299 case 8: res = (res << 8) | get_u8 ();
296 case 7: res = (res << 8) | get_u8 (); 300 case 7: res = (res << 8) | get_u8 ();
297 case 6: res = (res << 8) | get_u8 (); 301 case 6: res = (res << 8) | get_u8 ();
298 case 5: res = (res << 8) | get_u8 (); 302 case 5: res = (res << 8) | get_u8 ();
303#endif
299 case 4: res = (res << 8) | get_u8 (); 304 case 4: res = (res << 8) | get_u8 ();
300 case 3: res = (res << 8) | get_u8 (); 305 case 3: res = (res << 8) | get_u8 ();
301 case 2: res = (res << 8) | get_u8 (); 306 case 2: res = (res << 8) | get_u8 ();
302 case 1: res = (res << 8) | get_u8 (); 307 case 1: res = (res << 8) | get_u8 ();
303 } 308 }
… …
310decode_int (void) 315decode_int (void)
311{ 316{
312 UV len = get_length (); 317 UV len = get_length ();
313 318
314 if (!len) 319 if (!len)
315 error ("invalid integer length equal to zero (X.690 8.3.1)"); 320 error ("invalid BER_TYPE_INT length zero (X.690 8.3.1)");
316 321
317 U8 *data = get_n (len); 322 U8 *data = get_n (len);
318 323
319 if (expect_false (len > 1)) 324 if (expect_false (len > 1))
320 { 325 {
321 U16 mask = (data [0] << 8) | data [1] & 0xff80; 326 U16 mask = (data [0] << 8) | data [1] & 0xff80;
322 327
323 if (expect_false (mask == 0xff80 || mask == 0x0000)) 328 if (expect_false (mask == 0xff80 || mask == 0x0000))
324 error ("illegal padding in integer (X.690 8.3.2)"); 329 error ("illegal padding in BER_TYPE_INT (X.690 8.3.2)");
325 } 330 }
326 331
327 int negative = data [0] & 0x80; 332 int negative = data [0] & 0x80;
328 333
329 UV val = negative ? -1 : 0; // copy signbit to all bits 334 UV val = negative ? -1 : 0; // copy signbit to all bits
335
336 if (len > UVSIZE + (!negative && !*data))
337 error ("BER_TYPE_INT overflow");
330 338
331 do 339 do
332 val = (val << 8) | *data++; 340 val = (val << 8) | *data++;
333 while (--len); 341 while (--len);
334 342
… …
382{ 390{
383 UV len = get_length (); 391 UV len = get_length ();
384 392
385 if (len <= 0) 393 if (len <= 0)
386 { 394 {
387 error ("OBJECT IDENTIFIER length equal to zero"); 395 error ("BER_TYPE_OID length must not be zero");
388 return &PL_sv_undef; 396 return &PL_sv_undef;
389 } 397 }
390 398
391 U8 *end = cur + len; 399 U8 *end = cur + len;
392 UV w = get_w (); 400 UV w = get_w ();
393 401
394 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack 402 static char oid[MAX_OID_STRLEN]; // static, because too large for stack
395 char *app = oid; 403 char *app = oid;
396 404
397 if (relative) 405 if (relative)
398 app = write_uv (app, w); 406 app = write_uv (app, w);
407 else
408 {
409 UV w1, w2;
410
399 else if (w < 2 * 40) 411 if (w < 2 * 40)
400 { 412 (w1 = w / 40), (w2 = w % 40);
413 else
414 (w1 = 2), (w2 = w - 2 * 40);
415
401 app = write_uv (app, (U8)w / 40); 416 app = write_uv (app, w1);
402 *app++ = '.'; 417 *app++ = '.';
403 app = write_uv (app, (U8)w % 40);
404 }
405 else
406 {
407 app = write_uv (app, 2); 418 app = write_uv (app, w2);
408 *app++ = '.';
409 app = write_uv (app, w - 2 * 40);
410 } 419 }
411 420
412 while (cur < end) 421 while (cur < end)
413 { 422 {
414 // we assume an oid component is never > 64 digits 423 // we assume an oid component is never > 64 digits
… …
481 490
482 while (cur < buf + seqend) 491 while (cur < buf + seqend)
483 av_push (av, decode_ber ()); 492 av_push (av, decode_ber ());
484 493
485 if (cur > buf + seqend) 494 if (cur > buf + seqend)
486 croak ("constructed type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend); 495 croak ("CONSTRUCTED type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
487 496
488 res = newRV_inc ((SV *)av); 497 res = newRV_inc ((SV *)av);
489 } 498 }
490 else 499 else
491 switch (profile_lookup (cur_profile, klass, tag)) 500 switch (profile_lookup (cur_profile, klass, tag))
… …
556 case BER_TYPE_UCS4: 565 case BER_TYPE_UCS4:
557 res = decode_ucs (4); 566 res = decode_ucs (4);
558 break; 567 break;
559 568
560 case BER_TYPE_REAL: 569 case BER_TYPE_REAL:
570 error ("BER_TYPE_REAL not implemented");
571
561 case BER_TYPE_CROAK: 572 case BER_TYPE_CROAK:
573 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
574
562 default: 575 default:
563 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 576 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
564 } 577 }
565 578
566 AV *av = newAV (); 579 AV *av = newAV ();
… …
663 else 676 else
664 { 677 {
665 U8 *lenb = cur++; 678 U8 *lenb = cur++;
666 679
667#if UVSIZE > 4 680#if UVSIZE > 4
668 *cur = val >> 56; cur += *cur > 0; 681 *cur = val >> 56; cur += val >= ((UV)1 << (8 * 7));
669 *cur = val >> 48; cur += *cur > 0; 682 *cur = val >> 48; cur += val >= ((UV)1 << (8 * 6));
670 *cur = val >> 40; cur += *cur > 0; 683 *cur = val >> 40; cur += val >= ((UV)1 << (8 * 5));
671 *cur = val >> 32; cur += *cur > 0; 684 *cur = val >> 32; cur += val >= ((UV)1 << (8 * 4));
672#endif 685#endif
673 *cur = val >> 24; cur += *cur > 0; 686 *cur = val >> 24; cur += val >= ((UV)1 << (8 * 3));
674 *cur = val >> 16; cur += *cur > 0; 687 *cur = val >> 16; cur += val >= ((UV)1 << (8 * 2));
675 *cur = val >> 8; cur += *cur > 0; 688 *cur = val >> 8; cur += val >= ((UV)1 << (8 * 1));
676 *cur = val ; cur += 1; 689 *cur = val ; cur += 1;
677 690
678 *lenb = 0x80 + cur - lenb - 1; 691 *lenb = 0x80 + cur - lenb - 1;
679 } 692 }
680 693
… …
917 // and adjust later 930 // and adjust later
918 need (1); 931 need (1);
919 STRLEN mark = len_fixup_mark (); 932 STRLEN mark = len_fixup_mark ();
920 933
921 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV)) 934 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV))
922 croak ("BER constructed data must be array-reference"); 935 croak ("BER CONSTRUCTED data must be array-reference");
923 936
924 AV *av = (AV *)SvRV (data); 937 AV *av = (AV *)SvRV (data);
925 int fill = AvFILL (av); 938 int fill = AvFILL (av);
926 939
927 if (expect_false (SvRMAGICAL (av))) 940 if (expect_false (SvRMAGICAL (av)))
928 croak ("BER constructed data must not be tied"); 941 croak ("BER CONSTRUCTED data must not be tied");
929 942
930 int i; 943 int i;
931 for (i = 0; i <= fill; ++i) 944 for (i = 0; i <= fill; ++i)
932 encode_ber (AvARRAY (av)[i]); 945 encode_ber (AvARRAY (av)[i]);
933 946
… …
988 case BER_TYPE_UCS4: 1001 case BER_TYPE_UCS4:
989 encode_ucs (data, 4); 1002 encode_ucs (data, 4);
990 break; 1003 break;
991 1004
992 case BER_TYPE_REAL: 1005 case BER_TYPE_REAL:
1006 croak ("BER_TYPE_REAL not implemented");
1007
993 case BER_TYPE_CROAK: 1008 case BER_TYPE_CROAK:
1009 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
1010
994 default: 1011 default:
995 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 1012 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
996 } 1013 }
997 1014
998} 1015}
… …
1081 1098
1082 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1099 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
1083 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1100 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1084} 1101}
1085 1102
1086SV * 1103void
1087ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1104ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1105 ALIAS:
1106 ber_decode_prefix = 1
1088 CODE: 1107 PPCODE:
1089{ 1108{
1090 cur_profile = SvPROFILE (profile); 1109 cur_profile = SvPROFILE (profile);
1091 STRLEN len; 1110 STRLEN len;
1092 buf = (U8 *)SvPVbyte (ber, len); 1111 buf = (U8 *)SvPVbyte (ber, len);
1093 cur = buf; 1112 cur = buf;
1094 end = buf + len; 1113 end = buf + len;
1095 1114
1096 RETVAL = decode_ber (); 1115 SV *tuple = decode_ber ();
1116
1117 EXTEND (SP, 2);
1118 PUSHs (sv_2mortal (tuple));
1119
1120 if (ix)
1121 PUSHs (sv_2mortal (newSViv (cur - buf)));
1122 else if (cur != end)
1123 error ("trailing garbage after BER value");
1097} 1124}
1098 OUTPUT: RETVAL
1099 1125
1100void 1126void
1101ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *flags = &PL_sv_undef, SV *data = &PL_sv_undef) 1127ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *flags = &PL_sv_undef, SV *data = &PL_sv_undef)
1102 PPCODE: 1128 PPCODE:
1103{ 1129{

Diff Legend

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