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.27 by root, Mon Apr 22 11:01:49 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
137{ 141{
138 if (!SvOK (profile)) 142 if (!SvOK (profile))
139 return default_profile; 143 return default_profile;
140 144
141 if (!SvROK (profile)) 145 if (!SvROK (profile))
142 croak ("invalid profile"); 146 croak ("Convert::BER::XS::Profile expected");
143 147
144 profile = SvRV (profile); 148 profile = SvRV (profile);
145 149
146 if (SvSTASH (profile) != profile_stash) 150 if (SvSTASH (profile) != profile_stash)
147 croak ("invalid profile object"); 151 croak ("Convert::BER::XS::Profile expected");
148 152
149 return (void *)profile; 153 return (void *)profile;
150} 154}
151 155
152static int 156static int
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/////////////////////////////////////////////////////////////////////////////
223 error ("unexpected end of message buffer"); 227 error ("unexpected end of message buffer");
224} 228}
225 229
226// get_* functions fetch something from the buffer 230// get_* functions fetch something from the buffer
227// decode_* functions use get_* fun ctions to decode ber values 231// decode_* functions use get_* fun ctions to decode ber values
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}
228 242
229// get n octets 243// get n octets
230static U8 * 244static U8 *
231get_n (UV count) 245get_n (UV count)
232{ 246{
234 U8 *res = cur; 248 U8 *res = cur;
235 cur += count; 249 cur += count;
236 return res; 250 return res;
237} 251}
238 252
239// get single octet
240static U8
241get_u8 (void)
242{
243 if (cur == end)
244 error ("unexpected end of message buffer");
245
246 return *cur++;
247}
248
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 length 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 BER value lengths not supported");
279 return 0; 291
292 case 0x7f:
293 error ("BER 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 ("BER value length too long (must fit into UV)");
283 return 0;
284 297
298#if UVSIZE > 4
299 case 8: res = (res << 8) | get_u8 ();
300 case 7: res = (res << 8) | get_u8 ();
301 case 6: res = (res << 8) | get_u8 ();
302 case 5: res = (res << 8) | get_u8 ();
303#endif
285 case 4: res = (res << 8) | get_u8 (); 304 case 4: res = (res << 8) | get_u8 ();
286 case 3: res = (res << 8) | get_u8 (); 305 case 3: res = (res << 8) | get_u8 ();
287 case 2: res = (res << 8) | get_u8 (); 306 case 2: res = (res << 8) | get_u8 ();
288 case 1: res = (res << 8) | get_u8 (); 307 case 1: res = (res << 8) | get_u8 ();
289 } 308 }
291 310
292 return res; 311 return res;
293} 312}
294 313
295static SV * 314static SV *
296decode_int () 315decode_int (void)
297{ 316{
298 int len = get_length (); 317 UV len = get_length ();
299 318
300 if (len <= 0) 319 if (!len)
301 { 320 error ("invalid BER_TYPE_INT length zero (X.690 8.3.1)");
302 error ("integer length equal to zero");
303 return 0;
304 }
305 321
306 U8 *data = get_n (len); 322 U8 *data = get_n (len);
307 323
324 if (expect_false (len > 1))
325 {
326 U16 mask = (data [0] << 8) | data [1] & 0xff80;
327
328 if (expect_false (mask == 0xff80 || mask == 0x0000))
329 error ("illegal padding in BER_TYPE_INT (X.690 8.3.2)");
330 }
331
308 int negative = data [0] & 0x80; 332 int negative = data [0] & 0x80;
309 333
310 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");
311 338
312 do 339 do
313 val = (val << 8) | *data++; 340 val = (val << 8) | *data++;
314 while (--len); 341 while (--len);
315 342
319} 346}
320 347
321static SV * 348static SV *
322decode_data (void) 349decode_data (void)
323{ 350{
324 U32 len = get_length (); 351 UV len = get_length ();
325 U8 *data = get_n (len);
326 return newSVpvn ((char *)data, len); 352 return newSVpvn ((char *)get_n (len), len);
327} 353}
328 354
329// gelper for decode_object_identifier 355// helper for decode_object_identifier
330static char * 356static char *
331write_uv (char *buf, U32 u) 357write_uv (char *buf, UV u)
332{ 358{
333 // the one-digit case is absolutely predominant, so this pays off (hopefully) 359 // the one-digit case is absolutely predominant, so this pays off (hopefully)
334 if (expect_true (u < 10)) 360 if (expect_true (u < 10))
335 *buf++ = u + '0'; 361 *buf++ = u + '0';
336 else 362 else
337 { 363 {
364 // this *could* be done much faster using branchless fixed-point arithmetics
338 char *beg = buf; 365 char *beg = buf;
339 366
340 do 367 do
341 { 368 {
342 *buf++ = u % 10 + '0'; 369 *buf++ = u % 10 + '0';
343 u /= 10; 370 u /= 10;
344 } 371 }
345 while (u); 372 while (u);
346 373
347 // reverse digits 374 // reverse digits
348 for (char *ptr = buf; --ptr != beg; ++beg) 375 char *ptr = buf;
376 while (--ptr > beg)
349 { 377 {
350 char c = *ptr; 378 char c = *ptr;
351 *ptr = *beg; 379 *ptr = *beg;
352 *beg = c; 380 *beg = c;
381 ++beg;
353 } 382 }
354 } 383 }
355 384
356 return buf; 385 return buf;
357} 386}
358 387
359static SV * 388static SV *
360decode_oid (int relative) 389decode_oid (int relative)
361{ 390{
362 U32 len = get_length (); 391 UV len = get_length ();
363 392
364 if (len <= 0) 393 if (len <= 0)
365 { 394 {
366 error ("OBJECT IDENTIFIER length equal to zero"); 395 error ("BER_TYPE_OID length must not be zero");
367 return &PL_sv_undef; 396 return &PL_sv_undef;
368 } 397 }
369 398
370 U8 *end = cur + len; 399 U8 *end = cur + len;
371 U32 w = get_w (); 400 UV w = get_w ();
372 401
373 static char oid[MAX_OID_STRLEN]; // must be static 402 static char oid[MAX_OID_STRLEN]; // static, because too large for stack
374 char *app = oid; 403 char *app = oid;
375 404
376 if (relative) 405 if (relative)
377 app = write_uv (app, w); 406 app = write_uv (app, w);
378 else 407 else
379 { 408 {
409 UV w1, w2;
410
411 if (w < 2 * 40)
412 (w1 = w / 40), (w2 = w % 40);
413 else
414 (w1 = 2), (w2 = w - 2 * 40);
415
380 app = write_uv (app, (U8)w / 40); 416 app = write_uv (app, w1);
381 *app++ = '.'; 417 *app++ = '.';
382 app = write_uv (app, (U8)w % 40); 418 app = write_uv (app, w2);
419 }
420
421 while (cur < end)
383 } 422 {
384
385 // we assume an oid component is never > 64 bytes 423 // we assume an oid component is never > 64 digits
386 while (cur < end && oid + sizeof (oid) - app > 64) 424 if (oid + sizeof (oid) - app < 64)
387 { 425 croak ("BER_TYPE_OID to long to decode");
426
388 w = get_w (); 427 w = get_w ();
389 *app++ = '.'; 428 *app++ = '.';
390 app = write_uv (app, w); 429 app = write_uv (app, w);
391 } 430 }
392 431
397static SV * 436static SV *
398decode_ucs (int chrsize) 437decode_ucs (int chrsize)
399{ 438{
400 SV *res = NEWSV (0, 0); 439 SV *res = NEWSV (0, 0);
401 440
402 U32 len = get_length (); 441 UV len = get_length ();
403 442
404 if (len & (chrsize - 1)) 443 if (len & (chrsize - 1))
405 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 444 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
406 445
407 while (len) 446 while (len)
428 467
429 return res; 468 return res;
430} 469}
431 470
432static SV * 471static SV *
433decode_ber () 472decode_ber (void)
434{ 473{
435 int identifier = get_u8 (); 474 int identifier = get_u8 ();
436 475
437 SV *res; 476 SV *res;
438 477
441 int tag = identifier & ASN_TAG_MASK; 480 int tag = identifier & ASN_TAG_MASK;
442 481
443 if (tag == ASN_TAG_BER) 482 if (tag == ASN_TAG_BER)
444 tag = get_w (); 483 tag = get_w ();
445 484
446 if (tag == ASN_TAG_BER)
447 tag = get_w ();
448
449 if (constructed) 485 if (constructed)
450 { 486 {
451 U32 len = get_length (); 487 UV len = get_length ();
452 U32 seqend = (cur - buf) + len; 488 UV seqend = (cur - buf) + len;
453 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 489 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
454 490
455 while (cur < buf + seqend) 491 while (cur < buf + seqend)
456 av_push (av, decode_ber ()); 492 av_push (av, decode_ber ());
457 493
458 if (cur > buf + seqend) 494 if (cur > buf + seqend)
459 croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend); 495 croak ("CONSTRUCTED type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
460 496
461 res = newRV_inc ((SV *)av); 497 res = newRV_inc ((SV *)av);
462 } 498 }
463 else 499 else
464 switch (profile_lookup (cur_profile, klass, tag)) 500 switch (profile_lookup (cur_profile, klass, tag))
465 { 501 {
466 case BER_TYPE_NULL: 502 case BER_TYPE_NULL:
503 {
504 UV len = get_length ();
505
506 if (len)
507 croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
508
467 res = &PL_sv_undef; 509 res = &PL_sv_undef;
510 }
468 break; 511 break;
469 512
470 case BER_TYPE_BOOL: 513 case BER_TYPE_BOOL:
471 { 514 {
472 U32 len = get_length (); 515 UV len = get_length ();
473 516
474 if (len != 1) 517 if (len != 1)
475 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 518 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
476 519
477 res = newSVcacheint (get_u8 () ? 0 : 1); 520 res = newSVcacheint (!!get_u8 ());
478 } 521 }
479 break; 522 break;
480 523
481 case BER_TYPE_OID: 524 case BER_TYPE_OID:
482 res = decode_oid (0); 525 res = decode_oid (0);
499 res = decode_data (); 542 res = decode_data ();
500 break; 543 break;
501 544
502 case BER_TYPE_IPADDRESS: 545 case BER_TYPE_IPADDRESS:
503 { 546 {
504 U32 len = get_length (); 547 UV len = get_length ();
505 548
506 if (len != 4) 549 if (len != 4)
507 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 550 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
508 551
509 U8 c1 = get_u8 (); 552 U8 c1 = get_u8 ();
510 U8 c2 = get_u8 (); 553 U8 c2 = get_u8 ();
511 U8 c3 = get_u8 (); 554 U8 c3 = get_u8 ();
512 U8 c4 = get_u8 (); 555 U8 c4 = get_u8 ();
522 case BER_TYPE_UCS4: 565 case BER_TYPE_UCS4:
523 res = decode_ucs (4); 566 res = decode_ucs (4);
524 break; 567 break;
525 568
526 case BER_TYPE_REAL: 569 case BER_TYPE_REAL:
570 error ("BER_TYPE_REAL not implemented");
571
527 case BER_TYPE_CROAK: 572 case BER_TYPE_CROAK:
573 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
574
528 default: 575 default:
529 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 576 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
530 } 577 }
531 578
532 AV *av = newAV (); 579 AV *av = newAV ();
533 av_fill (av, BER_ARRAYSIZE - 1); 580 av_fill (av, BER_ARRAYSIZE - 1);
534 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 581 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
535 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 582 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
536 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 583 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
537 AvARRAY (av)[BER_DATA ] = res; 584 AvARRAY (av)[BER_DATA ] = res;
538 585
539 return newRV_noinc ((SV *)av); 586 return newRV_noinc ((SV *)av);
540} 587}
541 588
542///////////////////////////////////////////////////////////////////////////// 589/////////////////////////////////////////////////////////////////////////////
547strlen_sum (STRLEN l1, STRLEN l2) 594strlen_sum (STRLEN l1, STRLEN l2)
548{ 595{
549 size_t sum = l1 + l2; 596 size_t sum = l1 + l2;
550 597
551 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum) 598 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
552 croak ("JSON::XS: string size overflow"); 599 croak ("Convert::BER::XS: string size overflow");
553 600
554 return sum; 601 return sum;
555} 602}
556 603
557static void 604static void
558set_buf (SV *sv) 605set_buf (SV *sv)
559{ 606{
560 STRLEN len; 607 STRLEN len;
561 buf_sv = sv; 608 buf_sv = sv;
562 buf = SvPVbyte (buf_sv, len); 609 buf = (U8 *)SvPVbyte (buf_sv, len);
563 cur = buf; 610 cur = buf;
564 end = buf + len; 611 end = buf + len;
565} 612}
566 613
567/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */ 614/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
581need (STRLEN len) 628need (STRLEN len)
582{ 629{
583 if (expect_false ((uintptr_t)(end - cur) < len)) 630 if (expect_false ((uintptr_t)(end - cur) < len))
584 { 631 {
585 STRLEN pos = cur - buf; 632 STRLEN pos = cur - buf;
586 buf = my_sv_grow (buf_sv, pos, len); 633 buf = (U8 *)my_sv_grow (buf_sv, pos, len);
587 cur = buf + pos; 634 cur = buf + pos;
588 end = buf + SvLEN (buf_sv) - 1; 635 end = buf + SvLEN (buf_sv) - 1;
589 } 636 }
590} 637}
591 638
595 need (1); 642 need (1);
596 *cur++ = val; 643 *cur++ = val;
597} 644}
598 645
599static void 646static void
600put_w_nocheck (U32 val) 647put_w_nocheck (UV val)
601{ 648{
649#if UVSIZE > 4
650 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
651 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
652 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
653 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
654 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
655#endif
602 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 656 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
603 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 657 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
604 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 658 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
605 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 659 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
606 *cur = val & 0x7f; cur += 1; 660 *cur = val & 0x7f; cur += 1;
607} 661}
608 662
609static void 663static void
610put_w (U32 val) 664put_w (UV val)
611{ 665{
612 need (5); // we only handle up to 5 bytes 666 need (5); // we only handle up to 5 bytes
613 667
614 put_w_nocheck (val); 668 put_w_nocheck (val);
615} 669}
616 670
617static U8 * 671static U8 *
618put_length_at (U32 val, U8 *cur) 672put_length_at (UV val, U8 *cur)
619{ 673{
620 if (val < 0x7fU) 674 if (val < 0x7fU)
621 *cur++ = val; 675 *cur++ = val;
622 else 676 else
623 { 677 {
624 U8 *lenb = cur++; 678 U8 *lenb = cur++;
625 679
680#if UVSIZE > 4
681 *cur = val >> 56; cur += *cur > 0;
682 *cur = val >> 48; cur += *cur > 0;
683 *cur = val >> 40; cur += *cur > 0;
684 *cur = val >> 32; cur += *cur > 0;
685#endif
626 *cur = val >> 24; cur += *cur > 0; 686 *cur = val >> 24; cur += *cur > 0;
627 *cur = val >> 16; cur += *cur > 0; 687 *cur = val >> 16; cur += *cur > 0;
628 *cur = val >> 8; cur += *cur > 0; 688 *cur = val >> 8; cur += *cur > 0;
629 *cur = val ; cur += 1; 689 *cur = val ; cur += 1;
630 690
633 693
634 return cur; 694 return cur;
635} 695}
636 696
637static void 697static void
638put_length (U32 val) 698put_length (UV val)
639{ 699{
640 need (5 + val); 700 need (5 + val);
641 cur = put_length_at (val, cur); 701 cur = put_length_at (val, cur);
642} 702}
643 703
644// return how many bytes the encoded length requires 704// return how many bytes the encoded length requires
645static int length_length (U32 val) 705static int length_length (UV val)
646{ 706{
647 return val < 0x7fU 707 return val < 0x7fU
648 ? 1 708 ? 1
649 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 709 : 2
710 + (val > 0xffU)
711 + (val > 0xffffU)
712 + (val > 0xffffffU)
713#if UVSIZE > 4
714 + (val > 0xffffffffU)
715 + (val > 0xffffffffffU)
716 + (val > 0xffffffffffffU)
717 + (val > 0xffffffffffffffU)
718#endif
719 ;
650} 720}
651 721
652static void 722static void
653encode_data (const char *ptr, STRLEN len) 723encode_data (const char *ptr, STRLEN len)
654{ 724{
716 786
717 *lenb = cur - lenb - 1; 787 *lenb = cur - lenb - 1;
718} 788}
719 789
720// we don't know the length yet, so we optimistically 790// we don't know the length yet, so we optimistically
721// assume the length will need one octet later. if that 791// assume the length will need one octet later. If that
722// turns out to be wrong, we memove as needed. 792// turns out to be wrong, we memmove as needed.
723// mark the beginning 793// mark the beginning
724static STRLEN 794static STRLEN
725len_fixup_mark () 795len_fixup_mark (void)
726{ 796{
727 return cur++ - buf; 797 return cur++ - buf;
728} 798}
729 799
730// patch up the length 800// patch up the length
817 put_length (uchars * chrsize); 887 put_length (uchars * chrsize);
818 888
819 while (uchars--) 889 while (uchars--)
820 { 890 {
821 STRLEN uclen; 891 STRLEN uclen;
822 UV uchr = utf8_to_uvchr_buf (ptr, ptr + len, &uclen); 892 UV uchr = utf8_to_uvchr_buf ((U8 *)ptr, (U8 *)ptr + len, &uclen);
823 893
824 ptr += uclen; 894 ptr += uclen;
825 len -= uclen; 895 len -= uclen;
826 896
827 if (chrsize == 4) 897 if (chrsize == 4)
839{ 909{
840 AV *av = ber_tuple (tuple); 910 AV *av = ber_tuple (tuple);
841 911
842 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 912 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
843 int tag = SvIV (AvARRAY (av)[BER_TAG]); 913 int tag = SvIV (AvARRAY (av)[BER_TAG]);
844 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 914 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
845 SV *data = AvARRAY (av)[BER_DATA]; 915 SV *data = AvARRAY (av)[BER_DATA];
846 916
847 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 917 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
848 918
849 if (expect_false (tag >= ASN_TAG_BER)) 919 if (expect_false (tag >= ASN_TAG_BER))
860 // and adjust later 930 // and adjust later
861 need (1); 931 need (1);
862 STRLEN mark = len_fixup_mark (); 932 STRLEN mark = len_fixup_mark ();
863 933
864 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV)) 934 if (expect_false (!SvROK (data) || SvTYPE (SvRV (data)) != SVt_PVAV))
865 croak ("BER constructed data must be array-reference"); 935 croak ("BER CONSTRUCTED data must be array-reference");
866 936
867 AV *av = (AV *)SvRV (data); 937 AV *av = (AV *)SvRV (data);
868 int fill = AvFILL (av); 938 int fill = AvFILL (av);
869 939
870 if (expect_false (SvRMAGICAL (av))) 940 if (expect_false (SvRMAGICAL (av)))
871 croak ("BER constructed data must not be tied"); 941 croak ("BER CONSTRUCTED data must not be tied");
872 942
943 int i;
873 for (int i = 0; i <= fill; ++i) 944 for (i = 0; i <= fill; ++i)
874 encode_ber (AvARRAY (av)[i]); 945 encode_ber (AvARRAY (av)[i]);
875 946
876 len_fixup (mark); 947 len_fixup (mark);
877 } 948 }
878 else 949 else
882 put_length (0); 953 put_length (0);
883 break; 954 break;
884 955
885 case BER_TYPE_BOOL: 956 case BER_TYPE_BOOL:
886 put_length (1); 957 put_length (1);
887 *cur++ = SvTRUE (data) ? 0xff : 0x00; 958 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
888 break; 959 break;
889 960
890 case BER_TYPE_OID: 961 case BER_TYPE_OID:
891 encode_oid (data, 0); 962 encode_oid (data, 0);
892 break; 963 break;
930 case BER_TYPE_UCS4: 1001 case BER_TYPE_UCS4:
931 encode_ucs (data, 4); 1002 encode_ucs (data, 4);
932 break; 1003 break;
933 1004
934 case BER_TYPE_REAL: 1005 case BER_TYPE_REAL:
1006 croak ("BER_TYPE_REAL not implemented");
1007
935 case BER_TYPE_CROAK: 1008 case BER_TYPE_CROAK:
1009 croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
1010
936 default: 1011 default:
937 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 1012 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
938 } 1013 }
939 1014
940} 1015}
955 const char *name; 1030 const char *name;
956 IV iv; 1031 IV iv;
957 } *civ, const_iv[] = { 1032 } *civ, const_iv[] = {
958#define const_iv(name) { # name, name }, 1033#define const_iv(name) { # name, name },
959 const_iv (ASN_BOOLEAN) 1034 const_iv (ASN_BOOLEAN)
960 const_iv (ASN_INTEGER32) 1035 const_iv (ASN_INTEGER)
961 const_iv (ASN_BIT_STRING) 1036 const_iv (ASN_BIT_STRING)
962 const_iv (ASN_OCTET_STRING) 1037 const_iv (ASN_OCTET_STRING)
963 const_iv (ASN_NULL) 1038 const_iv (ASN_NULL)
964 const_iv (ASN_OBJECT_IDENTIFIER) 1039 const_iv (ASN_OBJECT_IDENTIFIER)
965 const_iv (ASN_OBJECT_DESCRIPTOR) 1040 const_iv (ASN_OBJECT_DESCRIPTOR)
994 const_iv (ASN_CONTEXT) 1069 const_iv (ASN_CONTEXT)
995 const_iv (ASN_PRIVATE) 1070 const_iv (ASN_PRIVATE)
996 1071
997 const_iv (BER_CLASS) 1072 const_iv (BER_CLASS)
998 const_iv (BER_TAG) 1073 const_iv (BER_TAG)
999 const_iv (BER_CONSTRUCTED) 1074 const_iv (BER_FLAGS)
1000 const_iv (BER_DATA) 1075 const_iv (BER_DATA)
1001 1076
1002 const_iv (BER_TYPE_BYTES) 1077 const_iv (BER_TYPE_BYTES)
1003 const_iv (BER_TYPE_UTF8) 1078 const_iv (BER_TYPE_UTF8)
1004 const_iv (BER_TYPE_UCS2) 1079 const_iv (BER_TYPE_UCS2)
1012 const_iv (BER_TYPE_IPADDRESS) 1087 const_iv (BER_TYPE_IPADDRESS)
1013 const_iv (BER_TYPE_CROAK) 1088 const_iv (BER_TYPE_CROAK)
1014 1089
1015 const_iv (SNMP_IPADDRESS) 1090 const_iv (SNMP_IPADDRESS)
1016 const_iv (SNMP_COUNTER32) 1091 const_iv (SNMP_COUNTER32)
1092 const_iv (SNMP_GAUGE32)
1017 const_iv (SNMP_UNSIGNED32) 1093 const_iv (SNMP_UNSIGNED32)
1018 const_iv (SNMP_TIMETICKS) 1094 const_iv (SNMP_TIMETICKS)
1019 const_iv (SNMP_OPAQUE) 1095 const_iv (SNMP_OPAQUE)
1020 const_iv (SNMP_COUNTER64) 1096 const_iv (SNMP_COUNTER64)
1021 }; 1097 };
1022 1098
1023 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--)
1024 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1100 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1025} 1101}
1026 1102
1027SV * 1103void
1028ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1104ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1105 ALIAS:
1106 ber_decode_prefix = 1
1029 CODE: 1107 PPCODE:
1030{ 1108{
1031 cur_profile = SvPROFILE (profile); 1109 cur_profile = SvPROFILE (profile);
1032 STRLEN len; 1110 STRLEN len;
1033 buf = SvPVbyte (ber, len); 1111 buf = (U8 *)SvPVbyte (ber, len);
1034 cur = buf; 1112 cur = buf;
1035 end = buf + len; 1113 end = buf + len;
1036 1114
1037 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");
1038} 1124}
1039 OUTPUT: RETVAL
1040 1125
1041void 1126void
1042ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &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)
1043 PPCODE: 1128 PPCODE:
1044{ 1129{
1045 if (!SvOK (tuple)) 1130 if (!SvOK (tuple))
1046 XSRETURN_NO; 1131 XSRETURN_NO;
1047 1132
1049 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1134 croak ("ber_is: tuple must be BER tuple (array-ref)");
1050 1135
1051 AV *av = (AV *)SvRV (tuple); 1136 AV *av = (AV *)SvRV (tuple);
1052 1137
1053 XPUSHs ( 1138 XPUSHs (
1054 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1139 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1055 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1140 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1056 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1141 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1057 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1142 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1058 ? &PL_sv_yes : &PL_sv_undef); 1143 ? &PL_sv_yes : &PL_sv_undef);
1059} 1144}
1060 1145
1061void 1146void
1062ber_is_seq (SV *tuple) 1147ber_is_seq (SV *tuple)
1066 XSRETURN_UNDEF; 1151 XSRETURN_UNDEF;
1067 1152
1068 AV *av = ber_tuple (tuple); 1153 AV *av = ber_tuple (tuple);
1069 1154
1070 XPUSHs ( 1155 XPUSHs (
1071 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1156 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1072 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1157 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1073 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1158 && SvIV (AvARRAY (av)[BER_FLAGS])
1074 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1159 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1075} 1160}
1076 1161
1077void 1162void
1078ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1163ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1079 PPCODE: 1164 PPCODE:
1080{ 1165{
1081 if (!SvOK (tuple)) 1166 if (!SvOK (tuple))
1082 XSRETURN_NO; 1167 XSRETURN_NO;
1083 1168
1084 AV *av = ber_tuple (tuple); 1169 AV *av = ber_tuple (tuple);
1085 1170
1086 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1171 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1087 1172
1088 XPUSHs ( 1173 XPUSHs (
1089 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1174 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1090 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1175 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1091 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1176 && !SvIV (AvARRAY (av)[BER_FLAGS])
1092 && (!SvOK (value) || data == SvIV (value)) 1177 && (!SvOK (value) || data == SvUV (value))
1093 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1178 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1094 : &PL_sv_undef); 1179 : &PL_sv_undef);
1095} 1180}
1096 1181
1097void 1182void
1098ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1183ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
1102 XSRETURN_NO; 1187 XSRETURN_NO;
1103 1188
1104 AV *av = ber_tuple (tuple); 1189 AV *av = ber_tuple (tuple);
1105 1190
1106 XPUSHs ( 1191 XPUSHs (
1107 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1192 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1108 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1193 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1109 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1194 && !SvIV (AvARRAY (av)[BER_FLAGS])
1110 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1195 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1111 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1196 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1112} 1197}
1113 1198
1114############################################################################# 1199#############################################################################
1127 SvCUR_set (buf_sv, cur - buf); 1212 SvCUR_set (buf_sv, cur - buf);
1128 XPUSHs (buf_sv); 1213 XPUSHs (buf_sv);
1129} 1214}
1130 1215
1131SV * 1216SV *
1132ber_i32 (IV iv) 1217ber_int (SV *sv)
1133 CODE: 1218 CODE:
1134{ 1219{
1135 AV *av = newAV (); 1220 AV *av = newAV ();
1136 av_fill (av, BER_ARRAYSIZE - 1); 1221 av_fill (av, BER_ARRAYSIZE - 1);
1137 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1222 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1138 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1223 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1139 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1224 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1140 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1225 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1141 RETVAL = newRV_noinc ((SV *)av); 1226 RETVAL = newRV_noinc ((SV *)av);
1142} 1227}
1143 OUTPUT: RETVAL 1228 OUTPUT: RETVAL
1144 1229
1145# TODO: not arrayref, but elements? 1230# TODO: not arrayref, but elements?
1147ber_seq (SV *arrayref) 1232ber_seq (SV *arrayref)
1148 CODE: 1233 CODE:
1149{ 1234{
1150 AV *av = newAV (); 1235 AV *av = newAV ();
1151 av_fill (av, BER_ARRAYSIZE - 1); 1236 av_fill (av, BER_ARRAYSIZE - 1);
1152 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1237 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1153 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1238 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1154 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1239 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1155 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1240 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1156 RETVAL = newRV_noinc ((SV *)av); 1241 RETVAL = newRV_noinc ((SV *)av);
1157} 1242}
1158 OUTPUT: RETVAL 1243 OUTPUT: RETVAL
1159 1244
1160MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1245MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines