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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines