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.7 by root, Sat Apr 20 01:31:07 2019 UTC vs.
Revision 1.19 by root, Sat Apr 20 16:34:34 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, //X 18 ASN_OID = 0x06,
16 ASN_OBJECT_DESCRIPTOR = 0x07, //X 19 ASN_OBJECT_DESCRIPTOR = 0x07,
17 ASN_EXTERNAL = 0x08, //X 20 ASN_EXTERNAL = 0x08,
18 ASN_REAL = 0x09, //X 21 ASN_REAL = 0x09,
19 ASN_ENUMERATED = 0x0a, //X 22 ASN_ENUMERATED = 0x0a,
20 ASN_EMBEDDED_PDV = 0x0b, //X 23 ASN_EMBEDDED_PDV = 0x0b,
21 ASN_UTF8_STRING = 0x0c, //X 24 ASN_UTF8_STRING = 0x0c,
22 ASN_RELATIVE_OID = 0x0d, //X 25 ASN_RELATIVE_OID = 0x0d,
23 ASN_SEQUENCE = 0x10, 26 ASN_SEQUENCE = 0x10,
24 ASN_SET = 0x11, //X 27 ASN_SET = 0x11,
25 ASN_NUMERIC_STRING = 0x12, //X 28 ASN_NUMERIC_STRING = 0x12,
26 ASN_PRINTABLE_STRING = 0x13, //X 29 ASN_PRINTABLE_STRING = 0x13,
27 ASN_TELETEX_STRING = 0x14, //X 30 ASN_TELETEX_STRING = 0x14,
28 ASN_T61_STRING = 0x14, //X 31 ASN_T61_STRING = 0x14,
29 ASN_VIDEOTEX_STRING = 0x15, //X 32 ASN_VIDEOTEX_STRING = 0x15,
30 ASN_IA5_STRING = 0x16, //X 33 ASN_IA5_STRING = 0x16,
31 ASN_ASCII_STRING = 0x16, //X 34 ASN_ASCII_STRING = 0x16,
32 ASN_UTC_TIME = 0x17, //X 35 ASN_UTC_TIME = 0x17,
33 ASN_GENERALIZED_TIME = 0x18, //X 36 ASN_GENERALIZED_TIME = 0x18,
34 ASN_GRAPHIC_STRING = 0x19, //X 37 ASN_GRAPHIC_STRING = 0x19,
35 ASN_VISIBLE_STRING = 0x1a, //X 38 ASN_VISIBLE_STRING = 0x1a,
36 ASN_ISO646_STRING = 0x1a, //X 39 ASN_ISO646_STRING = 0x1a,
37 ASN_GENERAL_STRING = 0x1b, //X 40 ASN_GENERAL_STRING = 0x1b,
38 ASN_UNIVERSAL_STRING = 0x1c, //X 41 ASN_UNIVERSAL_STRING = 0x1c,
39 ASN_CHARACTER_STRING = 0x1d, //X 42 ASN_CHARACTER_STRING = 0x1d,
40 ASN_BMP_STRING = 0x1e, //X 43 ASN_BMP_STRING = 0x1e,
41 44
42 ASN_TAG_BER = 0x1f, 45 ASN_TAG_BER = 0x1f,
43 ASN_TAG_MASK = 0x1f, 46 ASN_TAG_MASK = 0x1f,
44 47
45 // primitive/constructed 48 // primitive/constructed
… …
77 BER_TYPE_IPADDRESS, 80 BER_TYPE_IPADDRESS,
78 BER_TYPE_CROAK, 81 BER_TYPE_CROAK,
79}; 82};
80 83
81enum { 84enum {
82 BER_CLASS = 0, 85 BER_CLASS = 0,
83 BER_TAG = 1, 86 BER_TAG = 1,
84 BER_CONSTRUCTED = 2, 87 BER_FLAGS = 2,
85 BER_DATA = 3, 88 BER_DATA = 3,
86 BER_ARRAYSIZE 89 BER_ARRAYSIZE
87}; 90};
88 91
89#define MAX_OID_STRLEN 4096 92#define MAX_OID_STRLEN 4096
90 93
91typedef void profile_type; 94typedef void profile_type;
92 95
93static profile_type *cur_profile, *default_profile; 96static profile_type *cur_profile, *default_profile;
94static SV *buf_sv; // encoding buffer 97static SV *buf_sv; // encoding buffer
95static U8 *buf, *cur, *end; // buffer start, current, end 98static U8 *buf, *cur, *end; // buffer start, current, end
99
100#if PERL_VERSION < 18
101# define utf8_to_uvchr_buf(s,e,l) utf8_to_uvchr (s, l)
102#endif
96 103
97#if __GNUC__ >= 3 104#if __GNUC__ >= 3
98# define expect(expr,value) __builtin_expect ((expr), (value)) 105# define expect(expr,value) __builtin_expect ((expr), (value))
99# define INLINE static inline 106# define INLINE static inline
100#else 107#else
… …
155 return BER_TYPE_BYTES; 162 return BER_TYPE_BYTES;
156 163
157 return SvPVX (sv)[idx]; 164 return SvPVX (sv)[idx];
158} 165}
159 166
160static int 167static void
161profile_set (profile_type *profile, int klass, int tag, int type) 168profile_set (profile_type *profile, int klass, int tag, int type)
162{ 169{
163 SV *sv = (SV *)profile; 170 SV *sv = (SV *)profile;
164 U32 idx = (tag << 2) + klass; 171 U32 idx = (tag << 2) + klass;
165 STRLEN oldlen = SvCUR (sv); 172 STRLEN oldlen = SvCUR (sv);
… …
174 181
175 SvPVX (sv)[idx] = type; 182 SvPVX (sv)[idx] = type;
176} 183}
177 184
178static SV * 185static SV *
179profile_new () 186profile_new (void)
180{ 187{
181 SV *sv = newSVpvn ("", 0); 188 SV *sv = newSVpvn ("", 0);
182 189
183 static const struct { 190 static const struct {
184 int klass; 191 int klass;
185 int tag; 192 int tag;
186 int type; 193 int type;
187 } *celem, default_map[] = { 194 } *celem, default_map[] = {
188 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL }, 195 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
189 { ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT }, 196 { ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
190 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL }, 197 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
191 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID }, 198 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },
192 { ASN_UNIVERSAL, ASN_OBJECT_DESCRIPTOR, BER_TYPE_OID },
193 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID }, 199 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
194 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL }, 200 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
201 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
195 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 }, 202 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
196 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 }, 203 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
197 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 }, 204 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
198 }; 205 };
199 206
200 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem > default_map; celem--) 207 for (celem = default_map + sizeof (default_map) / sizeof (default_map [0]); celem-- > default_map; )
201 profile_set ((void *)sv, celem->klass, celem->tag, celem->type); 208 profile_set ((profile_type *)sv, celem->klass, celem->tag, celem->type);
202 209
203 return sv_bless (newRV_noinc (sv), profile_stash); 210 return sv_bless (newRV_noinc (sv), profile_stash);
204} 211}
205 212
206///////////////////////////////////////////////////////////////////////////// 213/////////////////////////////////////////////////////////////////////////////
… …
241 248
242 return *cur++; 249 return *cur++;
243} 250}
244 251
245// get ber-encoded integer (i.e. pack "w") 252// get ber-encoded integer (i.e. pack "w")
246static U32 253static UV
247get_w (void) 254get_w (void)
248{ 255{
249 U32 res = 0; 256 UV res = 0;
250 257
251 for (;;) 258 for (;;)
252 { 259 {
253 U8 c = get_u8 (); 260 U8 c = get_u8 ();
254 res = (res << 7) | (c & 0x7f); 261 res = (res << 7) | (c & 0x7f);
… …
256 if (!(c & 0x80)) 263 if (!(c & 0x80))
257 return res; 264 return res;
258 } 265 }
259} 266}
260 267
268// get_w, but disallow padding
261static U32 269static UV
270get_w_nopad (void)
271{
272 U8 first = get_u8 ();
273
274 if (first == 0x80)
275 error ("illegal BER padding");
276
277 --cur;
278
279 return get_w ();
280}
281
282static UV
262get_length (void) 283get_length (void)
263{ 284{
264 U32 res = get_u8 (); 285 UV res = get_u8 ();
265 286
266 if (res & 0x80) 287 if (res & 0x80)
267 { 288 {
268 int cnt = res & 0x7f; 289 int cnt = res & 0x7f;
269 res = 0; 290 res = 0;
… …
272 { 293 {
273 case 0: 294 case 0:
274 error ("indefinite ASN.1 lengths not supported"); 295 error ("indefinite ASN.1 lengths not supported");
275 return 0; 296 return 0;
276 297
298 //case 0x80: // indefinite length
299
300 //case 0xff: reserved
277 default: 301 default:
278 error ("ASN.1 length too long"); 302 error ("ASN.1 length too long");
279 return 0; 303 return 0;
280 304
305 case 8: res = (res << 8) | get_u8 ();
306 case 7: res = (res << 8) | get_u8 ();
307 case 6: res = (res << 8) | get_u8 ();
308 case 5: res = (res << 8) | get_u8 ();
281 case 4: res = (res << 8) | get_u8 (); 309 case 4: res = (res << 8) | get_u8 ();
282 case 3: res = (res << 8) | get_u8 (); 310 case 3: res = (res << 8) | get_u8 ();
283 case 2: res = (res << 8) | get_u8 (); 311 case 2: res = (res << 8) | get_u8 ();
284 case 1: res = (res << 8) | get_u8 (); 312 case 1: res = (res << 8) | get_u8 ();
285 } 313 }
… …
287 315
288 return res; 316 return res;
289} 317}
290 318
291static SV * 319static SV *
292decode_int () 320decode_int (void)
293{ 321{
294 int len = get_length (); 322 UV len = get_length ();
295 323
296 if (len <= 0) 324 if (!len)
297 { 325 {
298 error ("integer length equal to zero"); 326 error ("invalid integer length equal to zero");
299 return 0; 327 return 0;
300 } 328 }
301 329
302 U8 *data = get_n (len); 330 U8 *data = get_n (len);
303 331
… …
315} 343}
316 344
317static SV * 345static SV *
318decode_data (void) 346decode_data (void)
319{ 347{
320 U32 len = get_length (); 348 UV len = get_length ();
321 U8 *data = get_n (len);
322 return newSVpvn ((char *)data, len); 349 return newSVpvn ((char *)get_n (len), len);
323} 350}
324 351
325// gelper for decode_object_identifier 352// helper for decode_object_identifier
326static char * 353static char *
327write_uv (char *buf, U32 u) 354write_uv (char *buf, UV u)
328{ 355{
329 // the one-digit case is absolutely predominant, so this pays off (hopefully) 356 // the one-digit case is absolutely predominant, so this pays off (hopefully)
330 if (expect_true (u < 10)) 357 if (expect_true (u < 10))
331 *buf++ = u + '0'; 358 *buf++ = u + '0';
332 else 359 else
333 { 360 {
361 // this *could* be done much faster using branchless fixed-point arithmetics
334 char *beg = buf; 362 char *beg = buf;
335 363
336 do 364 do
337 { 365 {
338 *buf++ = u % 10 + '0'; 366 *buf++ = u % 10 + '0';
339 u /= 10; 367 u /= 10;
340 } 368 }
341 while (u); 369 while (u);
342 370
343 // reverse digits 371 // reverse digits
344 for (char *ptr = buf; --ptr != beg; ++beg) 372 char *ptr = buf;
373 while (--ptr > beg)
345 { 374 {
346 char c = *ptr; 375 char c = *ptr;
347 *ptr = *beg; 376 *ptr = *beg;
348 *beg = c; 377 *beg = c;
378 ++beg;
349 } 379 }
350 } 380 }
351 381
352 return buf; 382 return buf;
353} 383}
354 384
355static SV * 385static SV *
356decode_oid (int relative) 386decode_oid (int relative)
357{ 387{
358 U32 len = get_length (); 388 UV len = get_length ();
359 389
360 if (len <= 0) 390 if (len <= 0)
361 { 391 {
362 error ("OBJECT IDENTIFIER length equal to zero"); 392 error ("OBJECT IDENTIFIER length equal to zero");
363 return &PL_sv_undef; 393 return &PL_sv_undef;
364 } 394 }
365 395
366 U8 *end = cur + len; 396 U8 *end = cur + len;
367 U32 w = get_w (); 397 UV w = get_w_nopad ();
368 398
369 static char oid[MAX_OID_STRLEN]; // must be static 399 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
370 char *app = oid; 400 char *app = oid;
371 401
372 if (relative) 402 if (relative)
373 app = write_uv (app, w); 403 app = write_uv (app, w);
374 else 404 else if (w < 2 * 40)
375 { 405 {
376 app = write_uv (app, (U8)w / 40); 406 app = write_uv (app, (U8)w / 40);
377 *app++ = '.'; 407 *app++ = '.';
378 app = write_uv (app, (U8)w % 40); 408 app = write_uv (app, (U8)w % 40);
379 } 409 }
410 else
411 {
412 app = write_uv (app, 2);
413 *app++ = '.';
414 app = write_uv (app, w - 2 * 40);
415 }
380 416
417 while (cur < end)
418 {
381 // we assume an oid component is never > 64 bytes 419 // we assume an oid component is never > 64 digits
382 while (cur < end && oid + sizeof (oid) - app > 64) 420 if (oid + sizeof (oid) - app < 64)
383 { 421 croak ("BER_TYPE_OID to long to decode");
422
384 w = get_w (); 423 w = get_w_nopad ();
385 *app++ = '.'; 424 *app++ = '.';
386 app = write_uv (app, w); 425 app = write_uv (app, w);
387 } 426 }
388 427
389 return newSVpvn (oid, app - oid); 428 return newSVpvn (oid, app - oid);
… …
393static SV * 432static SV *
394decode_ucs (int chrsize) 433decode_ucs (int chrsize)
395{ 434{
396 SV *res = NEWSV (0, 0); 435 SV *res = NEWSV (0, 0);
397 436
398 U32 len = get_length (); 437 UV len = get_length ();
399 438
400 if (len & (chrsize - 1)) 439 if (len & (chrsize - 1))
401 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len); 440 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
402 441
403 while (len) 442 while (len)
… …
424 463
425 return res; 464 return res;
426} 465}
427 466
428static SV * 467static SV *
429decode_ber () 468decode_ber (void)
430{ 469{
431 int identifier = get_u8 (); 470 int identifier = get_u8 ();
432 471
433 SV *res; 472 SV *res;
434 473
… …
442 if (tag == ASN_TAG_BER) 481 if (tag == ASN_TAG_BER)
443 tag = get_w (); 482 tag = get_w ();
444 483
445 if (constructed) 484 if (constructed)
446 { 485 {
447 U32 len = get_length (); 486 UV len = get_length ();
448 U32 seqend = (cur - buf) + len; 487 UV seqend = (cur - buf) + len;
449 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 488 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
450 489
451 while (cur < buf + seqend) 490 while (cur < buf + seqend)
452 av_push (av, decode_ber ()); 491 av_push (av, decode_ber ());
453 492
… …
458 } 497 }
459 else 498 else
460 switch (profile_lookup (cur_profile, klass, tag)) 499 switch (profile_lookup (cur_profile, klass, tag))
461 { 500 {
462 case BER_TYPE_NULL: 501 case BER_TYPE_NULL:
502 {
503 UV len = get_length ();
504
505 if (len)
506 croak ("BER_TYPE_NULL value with non-zero length %d encountered", len);
507
463 res = &PL_sv_undef; 508 res = &PL_sv_undef;
509 }
464 break; 510 break;
465 511
466 case BER_TYPE_BOOL: 512 case BER_TYPE_BOOL:
467 { 513 {
468 U32 len = get_length (); 514 UV len = get_length ();
469 515
470 if (len != 1) 516 if (len != 1)
471 croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len); 517 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len);
472 518
473 res = newSVcacheint (get_u8 () ? 0 : 1); 519 res = newSVcacheint (!!get_u8 ());
474 } 520 }
475 break; 521 break;
476 522
477 case BER_TYPE_OID: 523 case BER_TYPE_OID:
478 res = decode_oid (0); 524 res = decode_oid (0);
… …
495 res = decode_data (); 541 res = decode_data ();
496 break; 542 break;
497 543
498 case BER_TYPE_IPADDRESS: 544 case BER_TYPE_IPADDRESS:
499 { 545 {
500 U32 len = get_length (); 546 UV len = get_length ();
501 547
502 if (len != 4) 548 if (len != 4)
503 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len); 549 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len);
504 550
505 U8 c1 = get_u8 (); 551 U8 c1 = get_u8 ();
… …
525 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 571 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
526 } 572 }
527 573
528 AV *av = newAV (); 574 AV *av = newAV ();
529 av_fill (av, BER_ARRAYSIZE - 1); 575 av_fill (av, BER_ARRAYSIZE - 1);
530 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 576 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
531 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 577 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
532 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 578 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
533 AvARRAY (av)[BER_DATA ] = res; 579 AvARRAY (av)[BER_DATA ] = res;
534 580
535 return newRV_noinc ((SV *)av); 581 return newRV_noinc ((SV *)av);
536} 582}
537 583
538///////////////////////////////////////////////////////////////////////////// 584/////////////////////////////////////////////////////////////////////////////
… …
553static void 599static void
554set_buf (SV *sv) 600set_buf (SV *sv)
555{ 601{
556 STRLEN len; 602 STRLEN len;
557 buf_sv = sv; 603 buf_sv = sv;
558 buf = SvPVbyte (buf_sv, len); 604 buf = (U8 *)SvPVbyte (buf_sv, len);
559 cur = buf; 605 cur = buf;
560 end = buf + len; 606 end = buf + len;
561} 607}
562 608
563/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */ 609/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
… …
577need (STRLEN len) 623need (STRLEN len)
578{ 624{
579 if (expect_false ((uintptr_t)(end - cur) < len)) 625 if (expect_false ((uintptr_t)(end - cur) < len))
580 { 626 {
581 STRLEN pos = cur - buf; 627 STRLEN pos = cur - buf;
582 buf = my_sv_grow (buf_sv, pos, len); 628 buf = (U8 *)my_sv_grow (buf_sv, pos, len);
583 cur = buf + pos; 629 cur = buf + pos;
584 end = buf + SvLEN (buf_sv) - 1; 630 end = buf + SvLEN (buf_sv) - 1;
585 } 631 }
586} 632}
587 633
… …
591 need (1); 637 need (1);
592 *cur++ = val; 638 *cur++ = val;
593} 639}
594 640
595static void 641static void
596put_w_nocheck (U32 val) 642put_w_nocheck (UV val)
597{ 643{
644#if UVSIZE > 4
645 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
646 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
647 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
648 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
649 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
650#endif
598 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 651 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
599 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 652 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
600 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 653 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
601 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 654 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
602 *cur = val & 0x7f; cur += 1; 655 *cur = val & 0x7f; cur += 1;
603} 656}
604 657
605static void 658static void
606put_w (U32 val) 659put_w (UV val)
607{ 660{
608 need (5); // we only handle up to 5 bytes 661 need (5); // we only handle up to 5 bytes
609 662
610 put_w_nocheck (val); 663 put_w_nocheck (val);
611} 664}
612 665
613static U8 * 666static U8 *
614put_length_at (U32 val, U8 *cur) 667put_length_at (UV val, U8 *cur)
615{ 668{
616 if (val < 0x7fU) 669 if (val < 0x7fU)
617 *cur++ = val; 670 *cur++ = val;
618 else 671 else
619 { 672 {
620 U8 *lenb = cur++; 673 U8 *lenb = cur++;
621 674
675#if UVSIZE > 4
676 *cur = val >> 56; cur += *cur > 0;
677 *cur = val >> 48; cur += *cur > 0;
678 *cur = val >> 40; cur += *cur > 0;
679 *cur = val >> 32; cur += *cur > 0;
680#endif
622 *cur = val >> 24; cur += *cur > 0; 681 *cur = val >> 24; cur += *cur > 0;
623 *cur = val >> 16; cur += *cur > 0; 682 *cur = val >> 16; cur += *cur > 0;
624 *cur = val >> 8; cur += *cur > 0; 683 *cur = val >> 8; cur += *cur > 0;
625 *cur = val ; cur += 1; 684 *cur = val ; cur += 1;
626 685
… …
629 688
630 return cur; 689 return cur;
631} 690}
632 691
633static void 692static void
634put_length (U32 val) 693put_length (UV val)
635{ 694{
636 need (5 + val); 695 need (5 + val);
637 cur = put_length_at (val, cur); 696 cur = put_length_at (val, cur);
638} 697}
639 698
640// return how many bytes the encoded length requires 699// return how many bytes the encoded length requires
641static int length_length (U32 val) 700static int length_length (UV val)
642{ 701{
643 return val < 0x7fU 702 return val < 0x7fU
644 ? 1 703 ? 1
645 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 704 : 2
705 + (val > 0xffU)
706 + (val > 0xffffU)
707 + (val > 0xffffffU)
708#if UVSIZE > 4
709 + (val > 0xffffffffU)
710 + (val > 0xffffffffffU)
711 + (val > 0xffffffffffffU)
712 + (val > 0xffffffffffffffU)
713#endif
714 ;
646} 715}
647 716
648static void 717static void
649encode_data (const char *ptr, STRLEN len) 718encode_data (const char *ptr, STRLEN len)
650{ 719{
… …
712 781
713 *lenb = cur - lenb - 1; 782 *lenb = cur - lenb - 1;
714} 783}
715 784
716// we don't know the length yet, so we optimistically 785// we don't know the length yet, so we optimistically
717// assume the length will need one octet later. if that 786// assume the length will need one octet later. If that
718// turns out to be wrong, we memove as needed. 787// turns out to be wrong, we memmove as needed.
719// mark the beginning 788// mark the beginning
720static STRLEN 789static STRLEN
721len_fixup_mark () 790len_fixup_mark (void)
722{ 791{
723 return cur++ - buf; 792 return cur++ - buf;
724} 793}
725 794
726// patch up the length 795// patch up the length
… …
813 put_length (uchars * chrsize); 882 put_length (uchars * chrsize);
814 883
815 while (uchars--) 884 while (uchars--)
816 { 885 {
817 STRLEN uclen; 886 STRLEN uclen;
818 UV uchr = utf8_to_uvchr_buf (ptr, ptr + len, &uclen); 887 UV uchr = utf8_to_uvchr_buf ((U8 *)ptr, (U8 *)ptr + len, &uclen);
819 888
820 ptr += uclen; 889 ptr += uclen;
821 len -= uclen; 890 len -= uclen;
822 891
823 if (chrsize == 4) 892 if (chrsize == 4)
… …
835{ 904{
836 AV *av = ber_tuple (tuple); 905 AV *av = ber_tuple (tuple);
837 906
838 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 907 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
839 int tag = SvIV (AvARRAY (av)[BER_TAG]); 908 int tag = SvIV (AvARRAY (av)[BER_TAG]);
840 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 909 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
841 SV *data = AvARRAY (av)[BER_DATA]; 910 SV *data = AvARRAY (av)[BER_DATA];
842 911
843 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 912 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
844 913
845 if (expect_false (tag >= ASN_TAG_BER)) 914 if (expect_false (tag >= ASN_TAG_BER))
… …
864 int fill = AvFILL (av); 933 int fill = AvFILL (av);
865 934
866 if (expect_false (SvRMAGICAL (av))) 935 if (expect_false (SvRMAGICAL (av)))
867 croak ("BER constructed data must not be tied"); 936 croak ("BER constructed data must not be tied");
868 937
938 int i;
869 for (int i = 0; i <= fill; ++i) 939 for (i = 0; i <= fill; ++i)
870 encode_ber (AvARRAY (av)[i]); 940 encode_ber (AvARRAY (av)[i]);
871 941
872 len_fixup (mark); 942 len_fixup (mark);
873 } 943 }
874 else 944 else
… …
878 put_length (0); 948 put_length (0);
879 break; 949 break;
880 950
881 case BER_TYPE_BOOL: 951 case BER_TYPE_BOOL:
882 put_length (1); 952 put_length (1);
883 *cur++ = SvTRUE (data) ? 0xff : 0x00; 953 *cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
884 break; 954 break;
885 955
886 case BER_TYPE_OID: 956 case BER_TYPE_OID:
887 encode_oid (data, 0); 957 encode_oid (data, 0);
888 break; 958 break;
… …
951 const char *name; 1021 const char *name;
952 IV iv; 1022 IV iv;
953 } *civ, const_iv[] = { 1023 } *civ, const_iv[] = {
954#define const_iv(name) { # name, name }, 1024#define const_iv(name) { # name, name },
955 const_iv (ASN_BOOLEAN) 1025 const_iv (ASN_BOOLEAN)
956 const_iv (ASN_INTEGER32) 1026 const_iv (ASN_INTEGER)
957 const_iv (ASN_BIT_STRING) 1027 const_iv (ASN_BIT_STRING)
958 const_iv (ASN_OCTET_STRING) 1028 const_iv (ASN_OCTET_STRING)
959 const_iv (ASN_NULL) 1029 const_iv (ASN_NULL)
960 const_iv (ASN_OBJECT_IDENTIFIER) 1030 const_iv (ASN_OBJECT_IDENTIFIER)
961 const_iv (ASN_OBJECT_DESCRIPTOR) 1031 const_iv (ASN_OBJECT_DESCRIPTOR)
… …
990 const_iv (ASN_CONTEXT) 1060 const_iv (ASN_CONTEXT)
991 const_iv (ASN_PRIVATE) 1061 const_iv (ASN_PRIVATE)
992 1062
993 const_iv (BER_CLASS) 1063 const_iv (BER_CLASS)
994 const_iv (BER_TAG) 1064 const_iv (BER_TAG)
995 const_iv (BER_CONSTRUCTED) 1065 const_iv (BER_FLAGS)
996 const_iv (BER_DATA) 1066 const_iv (BER_DATA)
997 1067
998 const_iv (BER_TYPE_BYTES) 1068 const_iv (BER_TYPE_BYTES)
999 const_iv (BER_TYPE_UTF8) 1069 const_iv (BER_TYPE_UTF8)
1000 const_iv (BER_TYPE_UCS2) 1070 const_iv (BER_TYPE_UCS2)
… …
1024ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1094ber_decode (SV *ber, SV *profile = &PL_sv_undef)
1025 CODE: 1095 CODE:
1026{ 1096{
1027 cur_profile = SvPROFILE (profile); 1097 cur_profile = SvPROFILE (profile);
1028 STRLEN len; 1098 STRLEN len;
1029 buf = SvPVbyte (ber, len); 1099 buf = (U8 *)SvPVbyte (ber, len);
1030 cur = buf; 1100 cur = buf;
1031 end = buf + len; 1101 end = buf + len;
1032 1102
1033 RETVAL = decode_ber (); 1103 RETVAL = decode_ber ();
1034} 1104}
1035 OUTPUT: RETVAL 1105 OUTPUT: RETVAL
1036 1106
1037void 1107void
1038ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1108ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *flags = &PL_sv_undef, SV *data = &PL_sv_undef)
1039 PPCODE: 1109 PPCODE:
1040{ 1110{
1041 if (!SvOK (tuple)) 1111 if (!SvOK (tuple))
1042 XSRETURN_NO; 1112 XSRETURN_NO;
1043 1113
… …
1045 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1115 croak ("ber_is: tuple must be BER tuple (array-ref)");
1046 1116
1047 AV *av = (AV *)SvRV (tuple); 1117 AV *av = (AV *)SvRV (tuple);
1048 1118
1049 XPUSHs ( 1119 XPUSHs (
1050 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1120 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1051 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1121 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1052 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1122 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1053 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1123 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
1054 ? &PL_sv_yes : &PL_sv_undef); 1124 ? &PL_sv_yes : &PL_sv_undef);
1055} 1125}
1056 1126
1057void 1127void
1058ber_is_seq (SV *tuple) 1128ber_is_seq (SV *tuple)
… …
1062 XSRETURN_UNDEF; 1132 XSRETURN_UNDEF;
1063 1133
1064 AV *av = ber_tuple (tuple); 1134 AV *av = ber_tuple (tuple);
1065 1135
1066 XPUSHs ( 1136 XPUSHs (
1067 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1137 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1068 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1138 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1069 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1139 && SvIV (AvARRAY (av)[BER_FLAGS])
1070 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1140 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1071} 1141}
1072 1142
1073void 1143void
1074ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1144ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
1075 PPCODE: 1145 PPCODE:
1076{ 1146{
1077 if (!SvOK (tuple)) 1147 if (!SvOK (tuple))
1078 XSRETURN_NO; 1148 XSRETURN_NO;
1079 1149
1080 AV *av = ber_tuple (tuple); 1150 AV *av = ber_tuple (tuple);
1081 1151
1082 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1152 UV data = SvUV (AvARRAY (av)[BER_DATA]);
1083 1153
1084 XPUSHs ( 1154 XPUSHs (
1085 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1155 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1086 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1156 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1087 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1157 && !SvIV (AvARRAY (av)[BER_FLAGS])
1088 && (!SvOK (value) || data == SvIV (value)) 1158 && (!SvOK (value) || data == SvUV (value))
1089 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1159 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1090 : &PL_sv_undef); 1160 : &PL_sv_undef);
1091} 1161}
1092 1162
1093void 1163void
1094ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1164ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
… …
1098 XSRETURN_NO; 1168 XSRETURN_NO;
1099 1169
1100 AV *av = ber_tuple (tuple); 1170 AV *av = ber_tuple (tuple);
1101 1171
1102 XPUSHs ( 1172 XPUSHs (
1103 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1173 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1104 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1174 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1105 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1175 && !SvIV (AvARRAY (av)[BER_FLAGS])
1106 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1176 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1107 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1177 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1108} 1178}
1109 1179
1110############################################################################# 1180#############################################################################
… …
1123 SvCUR_set (buf_sv, cur - buf); 1193 SvCUR_set (buf_sv, cur - buf);
1124 XPUSHs (buf_sv); 1194 XPUSHs (buf_sv);
1125} 1195}
1126 1196
1127SV * 1197SV *
1128ber_i32 (IV iv) 1198ber_int (SV *sv)
1129 CODE: 1199 CODE:
1130{ 1200{
1131 AV *av = newAV (); 1201 AV *av = newAV ();
1132 av_fill (av, BER_ARRAYSIZE - 1); 1202 av_fill (av, BER_ARRAYSIZE - 1);
1133 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1203 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1134 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1204 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1135 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1205 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1136 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1206 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1137 RETVAL = newRV_noinc ((SV *)av); 1207 RETVAL = newRV_noinc ((SV *)av);
1138} 1208}
1139 OUTPUT: RETVAL 1209 OUTPUT: RETVAL
1140 1210
1141# TODO: not arrayref, but elements? 1211# TODO: not arrayref, but elements?
… …
1143ber_seq (SV *arrayref) 1213ber_seq (SV *arrayref)
1144 CODE: 1214 CODE:
1145{ 1215{
1146 AV *av = newAV (); 1216 AV *av = newAV ();
1147 av_fill (av, BER_ARRAYSIZE - 1); 1217 av_fill (av, BER_ARRAYSIZE - 1);
1148 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1218 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1149 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1219 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1150 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1220 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1151 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1221 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1152 RETVAL = newRV_noinc ((SV *)av); 1222 RETVAL = newRV_noinc ((SV *)av);
1153} 1223}
1154 OUTPUT: RETVAL 1224 OUTPUT: RETVAL
1155 1225
1156MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1226MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

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