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.9 by root, Sat Apr 20 02:12:27 2019 UTC vs.
Revision 1.24 by root, Sun Apr 21 01:58:15 2019 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5// C99 required 5// C99 required!
6// this is not just for comments, but also for
7// integer constant semantics,
8// sscanf format modifiers and more.
6 9
7enum { 10enum {
8 // ASN_TAG 11 // ASN_TAG
9 ASN_BOOLEAN = 0x01, 12 ASN_BOOLEAN = 0x01,
10 ASN_INTEGER32 = 0x02, 13 ASN_INTEGER = 0x02,
11 ASN_BIT_STRING = 0x03, 14 ASN_BIT_STRING = 0x03,
12 ASN_OCTET_STRING = 0x04, 15 ASN_OCTET_STRING = 0x04,
13 ASN_NULL = 0x05, 16 ASN_NULL = 0x05,
14 ASN_OBJECT_IDENTIFIER = 0x06, 17 ASN_OBJECT_IDENTIFIER = 0x06,
15 ASN_OID = 0x06, 18 ASN_OID = 0x06,
55 ASN_CLASS_SHIFT = 6, 58 ASN_CLASS_SHIFT = 6,
56 59
57 // ASN_APPLICATION SNMP 60 // ASN_APPLICATION SNMP
58 SNMP_IPADDRESS = 0x00, 61 SNMP_IPADDRESS = 0x00,
59 SNMP_COUNTER32 = 0x01, 62 SNMP_COUNTER32 = 0x01,
63 SNMP_GAUGE32 = 0x02,
60 SNMP_UNSIGNED32 = 0x02, 64 SNMP_UNSIGNED32 = 0x02,
61 SNMP_TIMETICKS = 0x03, 65 SNMP_TIMETICKS = 0x03,
62 SNMP_OPAQUE = 0x04, 66 SNMP_OPAQUE = 0x04,
63 SNMP_COUNTER64 = 0x06, 67 SNMP_COUNTER64 = 0x06,
64}; 68};
77 BER_TYPE_IPADDRESS, 81 BER_TYPE_IPADDRESS,
78 BER_TYPE_CROAK, 82 BER_TYPE_CROAK,
79}; 83};
80 84
81enum { 85enum {
82 BER_CLASS = 0, 86 BER_CLASS = 0,
83 BER_TAG = 1, 87 BER_TAG = 1,
84 BER_CONSTRUCTED = 2, 88 BER_FLAGS = 2,
85 BER_DATA = 3, 89 BER_DATA = 3,
86 BER_ARRAYSIZE 90 BER_ARRAYSIZE
87}; 91};
88 92
89#define MAX_OID_STRLEN 4096 93#define MAX_OID_STRLEN 4096
90 94
159 return BER_TYPE_BYTES; 163 return BER_TYPE_BYTES;
160 164
161 return SvPVX (sv)[idx]; 165 return SvPVX (sv)[idx];
162} 166}
163 167
164static int 168static void
165profile_set (profile_type *profile, int klass, int tag, int type) 169profile_set (profile_type *profile, int klass, int tag, int type)
166{ 170{
167 SV *sv = (SV *)profile; 171 SV *sv = (SV *)profile;
168 U32 idx = (tag << 2) + klass; 172 U32 idx = (tag << 2) + klass;
169 STRLEN oldlen = SvCUR (sv); 173 STRLEN oldlen = SvCUR (sv);
178 182
179 SvPVX (sv)[idx] = type; 183 SvPVX (sv)[idx] = type;
180} 184}
181 185
182static SV * 186static SV *
183profile_new () 187profile_new (void)
184{ 188{
185 SV *sv = newSVpvn ("", 0); 189 SV *sv = newSVpvn ("", 0);
186 190
187 static const struct { 191 static const struct {
188 int klass; 192 int klass;
189 int tag; 193 int tag;
190 int type; 194 int type;
191 } *celem, default_map[] = { 195 } *celem, default_map[] = {
192 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL }, 196 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
193 { ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT }, 197 { ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
194 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL }, 198 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
195 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID }, 199 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },
196 { ASN_UNIVERSAL, ASN_OBJECT_DESCRIPTOR, BER_TYPE_OID },
197 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID }, 200 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
198 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL }, 201 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
202 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
199 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 }, 203 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
200 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 }, 204 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
201 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 }, 205 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
202 }; 206 };
203 207
204 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem > default_map; celem--) 208 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem-- > default_map; )
205 profile_set ((void *)sv, celem->klass, celem->tag, celem->type); 209 profile_set ((profile_type *)sv, celem->klass, celem->tag, celem->type);
206 210
207 return sv_bless (newRV_noinc (sv), profile_stash); 211 return sv_bless (newRV_noinc (sv), profile_stash);
208} 212}
209 213
210///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
245 249
246 return *cur++; 250 return *cur++;
247} 251}
248 252
249// get ber-encoded integer (i.e. pack "w") 253// get ber-encoded integer (i.e. pack "w")
250static U32 254static UV
251get_w (void) 255get_w (void)
252{ 256{
253 U32 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)");
254 262
255 for (;;) 263 for (;;)
256 { 264 {
257 U8 c = get_u8 (); 265 if (expect_false (res >> UVSIZE * 8 - 7))
266 error ("BER variable integer overflow");
267
258 res = (res << 7) | (c & 0x7f); 268 res = (res << 7) | (c & 0x7f);
259 269
260 if (!(c & 0x80)) 270 if (!(c & 0x80))
261 return res; 271 return res;
262 }
263}
264 272
273 c = get_u8 ();
274 }
275}
276
265static U32 277static UV
266get_length (void) 278get_length (void)
267{ 279{
268 U32 res = get_u8 (); 280 UV res = get_u8 ();
269 281
270 if (res & 0x80) 282 if (res & 0x80)
271 { 283 {
272 int cnt = res & 0x7f; 284 int cnt = res & 0x7f;
273 res = 0; 285 res = 0;
274 286
275 switch (cnt) 287 switch (cnt)
276 { 288 {
277 case 0: 289 case 0:
278 error ("indefinite ASN.1 lengths not supported"); 290 error ("indefinite ASN.1 lengths not supported");
279 return 0; 291
292 case 0x7f:
293 error ("ASN.1 reserved value in length (X.690 8.1.3.5)");
280 294
281 default: 295 default:
282 error ("ASN.1 length too long"); 296 error ("ASN.1 length too long (only up to 2**64 octets supported)");
283 return 0;
284 297
298 case 8: res = (res << 8) | get_u8 ();
299 case 7: res = (res << 8) | get_u8 ();
300 case 6: res = (res << 8) | get_u8 ();
301 case 5: res = (res << 8) | get_u8 ();
285 case 4: res = (res << 8) | get_u8 (); 302 case 4: res = (res << 8) | get_u8 ();
286 case 3: res = (res << 8) | get_u8 (); 303 case 3: res = (res << 8) | get_u8 ();
287 case 2: res = (res << 8) | get_u8 (); 304 case 2: res = (res << 8) | get_u8 ();
288 case 1: res = (res << 8) | get_u8 (); 305 case 1: res = (res << 8) | get_u8 ();
289 } 306 }
291 308
292 return res; 309 return res;
293} 310}
294 311
295static SV * 312static SV *
296decode_int () 313decode_int (void)
297{ 314{
298 int len = get_length (); 315 UV len = get_length ();
299 316
300 if (len <= 0) 317 if (!len)
301 {
302 error ("integer length equal to zero"); 318 error ("invalid integer length equal to zero (X.690 8.3.1)");
303 return 0;
304 }
305 319
306 U8 *data = get_n (len); 320 U8 *data = get_n (len);
307 321
322 if (expect_false (len > 1))
323 {
324 U16 mask = (data [0] << 8) | data [1] & 0xff80;
325
326 if (expect_false (mask == 0xff80 || mask == 0x0000))
327 error ("illegal padding in integer (X.690 8.3.2)");
328 }
329
308 int negative = data [0] & 0x80; 330 int negative = data [0] & 0x80;
309 331
310 UV val = negative ? -1 : 0; // copy signbit to all bits 332 UV val = negative ? -1 : 0; // copy signbit to all bits
333
334 if (len > UVSIZE + (!negative && !*data))
335 error ("INTEGER overflow");
311 336
312 do 337 do
313 val = (val << 8) | *data++; 338 val = (val << 8) | *data++;
314 while (--len); 339 while (--len);
315 340
319} 344}
320 345
321static SV * 346static SV *
322decode_data (void) 347decode_data (void)
323{ 348{
324 U32 len = get_length (); 349 UV len = get_length ();
325 U8 *data = get_n (len);
326 return newSVpvn ((char *)data, len); 350 return newSVpvn ((char *)get_n (len), len);
327} 351}
328 352
329// gelper for decode_object_identifier 353// helper for decode_object_identifier
330static char * 354static char *
331write_uv (char *buf, U32 u) 355write_uv (char *buf, UV u)
332{ 356{
333 // the one-digit case is absolutely predominant, so this pays off (hopefully) 357 // the one-digit case is absolutely predominant, so this pays off (hopefully)
334 if (expect_true (u < 10)) 358 if (expect_true (u < 10))
335 *buf++ = u + '0'; 359 *buf++ = u + '0';
336 else 360 else
337 { 361 {
362 // this *could* be done much faster using branchless fixed-point arithmetics
338 char *beg = buf; 363 char *beg = buf;
339 364
340 do 365 do
341 { 366 {
342 *buf++ = u % 10 + '0'; 367 *buf++ = u % 10 + '0';
343 u /= 10; 368 u /= 10;
344 } 369 }
345 while (u); 370 while (u);
346 371
347 // reverse digits 372 // reverse digits
348 for (char *ptr = buf; --ptr != beg; ++beg) 373 char *ptr = buf;
374 while (--ptr > beg)
349 { 375 {
350 char c = *ptr; 376 char c = *ptr;
351 *ptr = *beg; 377 *ptr = *beg;
352 *beg = c; 378 *beg = c;
379 ++beg;
353 } 380 }
354 } 381 }
355 382
356 return buf; 383 return buf;
357} 384}
358 385
359static SV * 386static SV *
360decode_oid (int relative) 387decode_oid (int relative)
361{ 388{
362 U32 len = get_length (); 389 UV len = get_length ();
363 390
364 if (len <= 0) 391 if (len <= 0)
365 { 392 {
366 error ("OBJECT IDENTIFIER length equal to zero"); 393 error ("OBJECT IDENTIFIER length equal to zero");
367 return &PL_sv_undef; 394 return &PL_sv_undef;
368 } 395 }
369 396
370 U8 *end = cur + len; 397 U8 *end = cur + len;
371 U32 w = get_w (); 398 UV w = get_w ();
372 399
373 static char oid[MAX_OID_STRLEN]; // must be static 400 static char oid[MAX_OID_STRLEN]; // static, because too large for stack
374 char *app = oid; 401 char *app = oid;
375 402
376 if (relative) 403 if (relative)
377 app = write_uv (app, w); 404 app = write_uv (app, w);
378 else 405 else if (w < 2 * 40)
379 { 406 {
380 app = write_uv (app, (U8)w / 40); 407 app = write_uv (app, (U8)w / 40);
381 *app++ = '.'; 408 *app++ = '.';
382 app = write_uv (app, (U8)w % 40); 409 app = write_uv (app, (U8)w % 40);
383 } 410 }
411 else
412 {
413 app = write_uv (app, 2);
414 *app++ = '.';
415 app = write_uv (app, w - 2 * 40);
416 }
384 417
418 while (cur < end)
419 {
385 // we assume an oid component is never > 64 bytes 420 // we assume an oid component is never > 64 digits
386 while (cur < end && oid + sizeof (oid) - app > 64) 421 if (oid + sizeof (oid) - app < 64)
387 { 422 croak ("BER_TYPE_OID to long to decode");
423
388 w = get_w (); 424 w = get_w ();
389 *app++ = '.'; 425 *app++ = '.';
390 app = write_uv (app, w); 426 app = write_uv (app, w);
391 } 427 }
392 428
397static SV * 433static SV *
398decode_ucs (int chrsize) 434decode_ucs (int chrsize)
399{ 435{
400 SV *res = NEWSV (0, 0); 436 SV *res = NEWSV (0, 0);
401 437
402 U32 len = get_length (); 438 UV len = get_length ();
403 439
404 if (len & (chrsize - 1)) 440 if (len & (chrsize - 1))
405 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 441 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
406 442
407 while (len) 443 while (len)
428 464
429 return res; 465 return res;
430} 466}
431 467
432static SV * 468static SV *
433decode_ber () 469decode_ber (void)
434{ 470{
435 int identifier = get_u8 (); 471 int identifier = get_u8 ();
436 472
437 SV *res; 473 SV *res;
438 474
441 int tag = identifier & ASN_TAG_MASK; 477 int tag = identifier & ASN_TAG_MASK;
442 478
443 if (tag == ASN_TAG_BER) 479 if (tag == ASN_TAG_BER)
444 tag = get_w (); 480 tag = get_w ();
445 481
446 if (tag == ASN_TAG_BER)
447 tag = get_w ();
448
449 if (constructed) 482 if (constructed)
450 { 483 {
451 U32 len = get_length (); 484 UV len = get_length ();
452 U32 seqend = (cur - buf) + len; 485 UV seqend = (cur - buf) + len;
453 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 486 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
454 487
455 while (cur < buf + seqend) 488 while (cur < buf + seqend)
456 av_push (av, decode_ber ()); 489 av_push (av, decode_ber ());
457 490
458 if (cur > buf + seqend) 491 if (cur > buf + seqend)
459 croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend); 492 croak ("constructed type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
460 493
461 res = newRV_inc ((SV *)av); 494 res = newRV_inc ((SV *)av);
462 } 495 }
463 else 496 else
464 switch (profile_lookup (cur_profile, klass, tag)) 497 switch (profile_lookup (cur_profile, klass, tag))
465 { 498 {
466 case BER_TYPE_NULL: 499 case BER_TYPE_NULL:
500 {
501 UV len = get_length ();
502
503 if (len)
504 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
505
467 res = &PL_sv_undef; 506 res = &PL_sv_undef;
507 }
468 break; 508 break;
469 509
470 case BER_TYPE_BOOL: 510 case BER_TYPE_BOOL:
471 { 511 {
472 U32 len = get_length (); 512 UV len = get_length ();
473 513
474 if (len != 1) 514 if (len != 1)
475 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 515 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
476 516
477 res = newSVcacheint (get_u8 () ? 0 : 1); 517 res = newSVcacheint (!!get_u8 ());
478 } 518 }
479 break; 519 break;
480 520
481 case BER_TYPE_OID: 521 case BER_TYPE_OID:
482 res = decode_oid (0); 522 res = decode_oid (0);
499 res = decode_data (); 539 res = decode_data ();
500 break; 540 break;
501 541
502 case BER_TYPE_IPADDRESS: 542 case BER_TYPE_IPADDRESS:
503 { 543 {
504 U32 len = get_length (); 544 UV len = get_length ();
505 545
506 if (len != 4) 546 if (len != 4)
507 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 547 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
508 548
509 U8 c1 = get_u8 (); 549 U8 c1 = get_u8 ();
510 U8 c2 = get_u8 (); 550 U8 c2 = get_u8 ();
511 U8 c3 = get_u8 (); 551 U8 c3 = get_u8 ();
512 U8 c4 = get_u8 (); 552 U8 c4 = get_u8 ();
529 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 569 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
530 } 570 }
531 571
532 AV *av = newAV (); 572 AV *av = newAV ();
533 av_fill (av, BER_ARRAYSIZE - 1); 573 av_fill (av, BER_ARRAYSIZE - 1);
534 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 574 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
535 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 575 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
536 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 576 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
537 AvARRAY (av)[BER_DATA ] = res; 577 AvARRAY (av)[BER_DATA ] = res;
538 578
539 return newRV_noinc ((SV *)av); 579 return newRV_noinc ((SV *)av);
540} 580}
541 581
542///////////////////////////////////////////////////////////////////////////// 582/////////////////////////////////////////////////////////////////////////////
547strlen_sum (STRLEN l1, STRLEN l2) 587strlen_sum (STRLEN l1, STRLEN l2)
548{ 588{
549 size_t sum = l1 + l2; 589 size_t sum = l1 + l2;
550 590
551 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 591 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
552 croak ("JSON::XS: string size overflow"); 592 croak ("Convert::BER::XS: string size overflow");
553 593
554 return sum; 594 return sum;
555} 595}
556 596
557static void 597static void
558set_buf (SV *sv) 598set_buf (SV *sv)
559{ 599{
560 STRLEN len; 600 STRLEN len;
561 buf_sv = sv; 601 buf_sv = sv;
562 buf = SvPVbyte (buf_sv, len); 602 buf = (U8 *)SvPVbyte (buf_sv, len);
563 cur = buf; 603 cur = buf;
564 end = buf + len; 604 end = buf + len;
565} 605}
566 606
567/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */ 607/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
581need (STRLEN len) 621need (STRLEN len)
582{ 622{
583 if (expect_false ((uintptr_t)(end - cur) < len)) 623 if (expect_false ((uintptr_t)(end - cur) < len))
584 { 624 {
585 STRLEN pos = cur - buf; 625 STRLEN pos = cur - buf;
586 buf = my_sv_grow (buf_sv, pos, len); 626 buf = (U8 *)my_sv_grow (buf_sv, pos, len);
587 cur = buf + pos; 627 cur = buf + pos;
588 end = buf + SvLEN (buf_sv) - 1; 628 end = buf + SvLEN (buf_sv) - 1;
589 } 629 }
590} 630}
591 631
595 need (1); 635 need (1);
596 *cur++ = val; 636 *cur++ = val;
597} 637}
598 638
599static void 639static void
600put_w_nocheck (U32 val) 640put_w_nocheck (UV val)
601{ 641{
642#if UVSIZE > 4
643 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
644 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
645 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
646 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
647 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
648#endif
602 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 649 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
603 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 650 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
604 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 651 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
605 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 652 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
606 *cur = val & 0x7f; cur += 1; 653 *cur = val & 0x7f; cur += 1;
607} 654}
608 655
609static void 656static void
610put_w (U32 val) 657put_w (UV val)
611{ 658{
612 need (5); // we only handle up to 5 bytes 659 need (5); // we only handle up to 5 bytes
613 660
614 put_w_nocheck (val); 661 put_w_nocheck (val);
615} 662}
616 663
617static U8 * 664static U8 *
618put_length_at (U32 val, U8 *cur) 665put_length_at (UV val, U8 *cur)
619{ 666{
620 if (val < 0x7fU) 667 if (val < 0x7fU)
621 *cur++ = val; 668 *cur++ = val;
622 else 669 else
623 { 670 {
624 U8 *lenb = cur++; 671 U8 *lenb = cur++;
625 672
673#if UVSIZE > 4
674 *cur = val >> 56; cur += *cur > 0;
675 *cur = val >> 48; cur += *cur > 0;
676 *cur = val >> 40; cur += *cur > 0;
677 *cur = val >> 32; cur += *cur > 0;
678#endif
626 *cur = val >> 24; cur += *cur > 0; 679 *cur = val >> 24; cur += *cur > 0;
627 *cur = val >> 16; cur += *cur > 0; 680 *cur = val >> 16; cur += *cur > 0;
628 *cur = val >> 8; cur += *cur > 0; 681 *cur = val >> 8; cur += *cur > 0;
629 *cur = val ; cur += 1; 682 *cur = val ; cur += 1;
630 683
633 686
634 return cur; 687 return cur;
635} 688}
636 689
637static void 690static void
638put_length (U32 val) 691put_length (UV val)
639{ 692{
640 need (5 + val); 693 need (5 + val);
641 cur = put_length_at (val, cur); 694 cur = put_length_at (val, cur);
642} 695}
643 696
644// return how many bytes the encoded length requires 697// return how many bytes the encoded length requires
645static int length_length (U32 val) 698static int length_length (UV val)
646{ 699{
647 return val < 0x7fU 700 return val < 0x7fU
648 ? 1 701 ? 1
649 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 702 : 2
703 + (val > 0xffU)
704 + (val > 0xffffU)
705 + (val > 0xffffffU)
706#if UVSIZE > 4
707 + (val > 0xffffffffU)
708 + (val > 0xffffffffffU)
709 + (val > 0xffffffffffffU)
710 + (val > 0xffffffffffffffU)
711#endif
712 ;
650} 713}
651 714
652static void 715static void
653encode_data (const char *ptr, STRLEN len) 716encode_data (const char *ptr, STRLEN len)
654{ 717{
716 779
717 *lenb = cur - lenb - 1; 780 *lenb = cur - lenb - 1;
718} 781}
719 782
720// we don't know the length yet, so we optimistically 783// we don't know the length yet, so we optimistically
721// assume the length will need one octet later. if that 784// assume the length will need one octet later. If that
722// turns out to be wrong, we memove as needed. 785// turns out to be wrong, we memmove as needed.
723// mark the beginning 786// mark the beginning
724static STRLEN 787static STRLEN
725len_fixup_mark () 788len_fixup_mark (void)
726{ 789{
727 return cur++ - buf; 790 return cur++ - buf;
728} 791}
729 792
730// patch up the length 793// patch up the length
817 put_length (uchars * chrsize); 880 put_length (uchars * chrsize);
818 881
819 while (uchars--) 882 while (uchars--)
820 { 883 {
821 STRLEN uclen; 884 STRLEN uclen;
822 UV uchr = utf8_to_uvchr_buf (ptr, ptr + len, &uclen); 885 UV uchr = utf8_to_uvchr_buf ((U8 *)ptr, (U8 *)ptr + len, &uclen);
823 886
824 ptr += uclen; 887 ptr += uclen;
825 len -= uclen; 888 len -= uclen;
826 889
827 if (chrsize == 4) 890 if (chrsize == 4)
839{ 902{
840 AV *av = ber_tuple (tuple); 903 AV *av = ber_tuple (tuple);
841 904
842 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 905 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
843 int tag = SvIV (AvARRAY (av)[BER_TAG]); 906 int tag = SvIV (AvARRAY (av)[BER_TAG]);
844 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 907 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
845 SV *data = AvARRAY (av)[BER_DATA]; 908 SV *data = AvARRAY (av)[BER_DATA];
846 909
847 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 910 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
848 911
849 if (expect_false (tag >= ASN_TAG_BER)) 912 if (expect_false (tag >= ASN_TAG_BER))
868 int fill = AvFILL (av); 931 int fill = AvFILL (av);
869 932
870 if (expect_false (SvRMAGICAL (av))) 933 if (expect_false (SvRMAGICAL (av)))
871 croak ("BER constructed data must not be tied"); 934 croak ("BER constructed data must not be tied");
872 935
936 int i;
873 for (int i = 0; i <= fill; ++i) 937 for (i = 0; i <= fill; ++i)
874 encode_ber (AvARRAY (av)[i]); 938 encode_ber (AvARRAY (av)[i]);
875 939
876 len_fixup (mark); 940 len_fixup (mark);
877 } 941 }
878 else 942 else
882 put_length (0); 946 put_length (0);
883 break; 947 break;
884 948
885 case BER_TYPE_BOOL: 949 case BER_TYPE_BOOL:
886 put_length (1); 950 put_length (1);
887 *cur++ = SvTRUE (data) ? 0xff : 0x00; 951 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
888 break; 952 break;
889 953
890 case BER_TYPE_OID: 954 case BER_TYPE_OID:
891 encode_oid (data, 0); 955 encode_oid (data, 0);
892 break; 956 break;
955 const char *name; 1019 const char *name;
956 IV iv; 1020 IV iv;
957 } *civ, const_iv[] = { 1021 } *civ, const_iv[] = {
958#define const_iv(name) { # name, name }, 1022#define const_iv(name) { # name, name },
959 const_iv (ASN_BOOLEAN) 1023 const_iv (ASN_BOOLEAN)
960 const_iv (ASN_INTEGER32) 1024 const_iv (ASN_INTEGER)
961 const_iv (ASN_BIT_STRING) 1025 const_iv (ASN_BIT_STRING)
962 const_iv (ASN_OCTET_STRING) 1026 const_iv (ASN_OCTET_STRING)
963 const_iv (ASN_NULL) 1027 const_iv (ASN_NULL)
964 const_iv (ASN_OBJECT_IDENTIFIER) 1028 const_iv (ASN_OBJECT_IDENTIFIER)
965 const_iv (ASN_OBJECT_DESCRIPTOR) 1029 const_iv (ASN_OBJECT_DESCRIPTOR)
994 const_iv (ASN_CONTEXT) 1058 const_iv (ASN_CONTEXT)
995 const_iv (ASN_PRIVATE) 1059 const_iv (ASN_PRIVATE)
996 1060
997 const_iv (BER_CLASS) 1061 const_iv (BER_CLASS)
998 const_iv (BER_TAG) 1062 const_iv (BER_TAG)
999 const_iv (BER_CONSTRUCTED) 1063 const_iv (BER_FLAGS)
1000 const_iv (BER_DATA) 1064 const_iv (BER_DATA)
1001 1065
1002 const_iv (BER_TYPE_BYTES) 1066 const_iv (BER_TYPE_BYTES)
1003 const_iv (BER_TYPE_UTF8) 1067 const_iv (BER_TYPE_UTF8)
1004 const_iv (BER_TYPE_UCS2) 1068 const_iv (BER_TYPE_UCS2)
1012 const_iv (BER_TYPE_IPADDRESS) 1076 const_iv (BER_TYPE_IPADDRESS)
1013 const_iv (BER_TYPE_CROAK) 1077 const_iv (BER_TYPE_CROAK)
1014 1078
1015 const_iv (SNMP_IPADDRESS) 1079 const_iv (SNMP_IPADDRESS)
1016 const_iv (SNMP_COUNTER32) 1080 const_iv (SNMP_COUNTER32)
1081 const_iv (SNMP_GAUGE32)
1017 const_iv (SNMP_UNSIGNED32) 1082 const_iv (SNMP_UNSIGNED32)
1018 const_iv (SNMP_TIMETICKS) 1083 const_iv (SNMP_TIMETICKS)
1019 const_iv (SNMP_OPAQUE) 1084 const_iv (SNMP_OPAQUE)
1020 const_iv (SNMP_COUNTER64) 1085 const_iv (SNMP_COUNTER64)
1021 }; 1086 };
1022 1087
1023 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1088 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
1024 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1089 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1025} 1090}
1026 1091
1027SV * 1092void
1028ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1093ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1094 ALIAS:
1095 ber_decode_prefix = 1
1029 CODE: 1096 PPCODE:
1030{ 1097{
1031 cur_profile = SvPROFILE (profile); 1098 cur_profile = SvPROFILE (profile);
1032 STRLEN len; 1099 STRLEN len;
1033 buf = SvPVbyte (ber, len); 1100 buf = (U8 *)SvPVbyte (ber, len);
1034 cur = buf; 1101 cur = buf;
1035 end = buf + len; 1102 end = buf + len;
1036 1103
1037 RETVAL = decode_ber (); 1104 SV *tuple = decode_ber ();
1105
1106 EXTEND (SP, 2);
1107 PUSHs (sv_2mortal (tuple));
1108
1109 if (ix)
1110 PUSHs (sv_2mortal (newSViv (cur - buf)));
1111 else if (cur != end)
1112 error ("trailing garbage after BER data");
1038} 1113}
1039 OUTPUT: RETVAL
1040 1114
1041void 1115void
1042ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1116ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *flags = &PL_sv_undef, SV *data = &PL_sv_undef)
1043 PPCODE: 1117 PPCODE:
1044{ 1118{
1045 if (!SvOK (tuple)) 1119 if (!SvOK (tuple))
1046 XSRETURN_NO; 1120 XSRETURN_NO;
1047 1121
1049 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1123 croak ("ber_is: tuple must be BER tuple (array-ref)");
1050 1124
1051 AV *av = (AV *)SvRV (tuple); 1125 AV *av = (AV *)SvRV (tuple);
1052 1126
1053 XPUSHs ( 1127 XPUSHs (
1054 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1128 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1055 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1129 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1056 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1130 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1057 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1131 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1058 ? &PL_sv_yes : &PL_sv_undef); 1132 ? &PL_sv_yes : &PL_sv_undef);
1059} 1133}
1060 1134
1061void 1135void
1062ber_is_seq (SV *tuple) 1136ber_is_seq (SV *tuple)
1066 XSRETURN_UNDEF; 1140 XSRETURN_UNDEF;
1067 1141
1068 AV *av = ber_tuple (tuple); 1142 AV *av = ber_tuple (tuple);
1069 1143
1070 XPUSHs ( 1144 XPUSHs (
1071 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1145 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1072 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1146 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1073 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1147 && SvIV (AvARRAY (av)[BER_FLAGS])
1074 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1148 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1075} 1149}
1076 1150
1077void 1151void
1078ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1152ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1079 PPCODE: 1153 PPCODE:
1080{ 1154{
1081 if (!SvOK (tuple)) 1155 if (!SvOK (tuple))
1082 XSRETURN_NO; 1156 XSRETURN_NO;
1083 1157
1084 AV *av = ber_tuple (tuple); 1158 AV *av = ber_tuple (tuple);
1085 1159
1086 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1160 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1087 1161
1088 XPUSHs ( 1162 XPUSHs (
1089 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1163 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1090 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1164 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1091 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1165 && !SvIV (AvARRAY (av)[BER_FLAGS])
1092 && (!SvOK (value) || data == SvIV (value)) 1166 && (!SvOK (value) || data == SvUV (value))
1093 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1167 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1094 : &PL_sv_undef); 1168 : &PL_sv_undef);
1095} 1169}
1096 1170
1097void 1171void
1098ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1172ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1102 XSRETURN_NO; 1176 XSRETURN_NO;
1103 1177
1104 AV *av = ber_tuple (tuple); 1178 AV *av = ber_tuple (tuple);
1105 1179
1106 XPUSHs ( 1180 XPUSHs (
1107 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1181 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1108 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1182 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1109 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1183 && !SvIV (AvARRAY (av)[BER_FLAGS])
1110 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1184 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1111 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1185 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1112} 1186}
1113 1187
1114############################################################################# 1188#############################################################################
1127 SvCUR_set (buf_sv, cur - buf); 1201 SvCUR_set (buf_sv, cur - buf);
1128 XPUSHs (buf_sv); 1202 XPUSHs (buf_sv);
1129} 1203}
1130 1204
1131SV * 1205SV *
1132ber_i32 (IV iv) 1206ber_int (SV *sv)
1133 CODE: 1207 CODE:
1134{ 1208{
1135 AV *av = newAV (); 1209 AV *av = newAV ();
1136 av_fill (av, BER_ARRAYSIZE - 1); 1210 av_fill (av, BER_ARRAYSIZE - 1);
1137 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1211 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1138 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1212 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1139 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1213 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1140 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1214 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1141 RETVAL = newRV_noinc ((SV *)av); 1215 RETVAL = newRV_noinc ((SV *)av);
1142} 1216}
1143 OUTPUT: RETVAL 1217 OUTPUT: RETVAL
1144 1218
1145# TODO: not arrayref, but elements? 1219# TODO: not arrayref, but elements?
1147ber_seq (SV *arrayref) 1221ber_seq (SV *arrayref)
1148 CODE: 1222 CODE:
1149{ 1223{
1150 AV *av = newAV (); 1224 AV *av = newAV ();
1151 av_fill (av, BER_ARRAYSIZE - 1); 1225 av_fill (av, BER_ARRAYSIZE - 1);
1152 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1226 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1153 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1227 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1154 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1228 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1155 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1229 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1156 RETVAL = newRV_noinc ((SV *)av); 1230 RETVAL = newRV_noinc ((SV *)av);
1157} 1231}
1158 OUTPUT: RETVAL 1232 OUTPUT: RETVAL
1159 1233
1160MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1234MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines