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.5 by root, Fri Apr 19 23:50:53 2019 UTC vs.
Revision 1.16 by root, Sat Apr 20 15:37:27 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
… …
72 BER_TYPE_OID, 75 BER_TYPE_OID,
73 BER_TYPE_RELOID, 76 BER_TYPE_RELOID,
74 BER_TYPE_NULL, 77 BER_TYPE_NULL,
75 BER_TYPE_BOOL, 78 BER_TYPE_BOOL,
76 BER_TYPE_REAL, 79 BER_TYPE_REAL,
80 BER_TYPE_IPADDRESS,
77 BER_TYPE_CROAK, 81 BER_TYPE_CROAK,
78}; 82};
79 83
80enum { 84enum {
81 BER_CLASS = 0, 85 BER_CLASS = 0,
82 BER_TAG = 1, 86 BER_TAG = 1,
83 BER_CONSTRUCTED = 2, 87 BER_FLAGS = 2,
84 BER_DATA = 3, 88 BER_DATA = 3,
85 BER_ARRAYSIZE 89 BER_ARRAYSIZE
86}; 90};
87 91
88#define MAX_OID_STRLEN 4096 92#define MAX_OID_STRLEN 4096
89 93
90typedef void profile_type; 94typedef void profile_type;
91 95
92static profile_type *cur_profile, *default_profile; 96static profile_type *cur_profile, *default_profile;
93static SV *buf_sv; // encoding buffer 97static SV *buf_sv; // encoding buffer
94static 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
95 103
96#if __GNUC__ >= 3 104#if __GNUC__ >= 3
97# define expect(expr,value) __builtin_expect ((expr), (value)) 105# define expect(expr,value) __builtin_expect ((expr), (value))
98# define INLINE static inline 106# define INLINE static inline
99#else 107#else
… …
129 137
130static profile_type * 138static profile_type *
131SvPROFILE (SV *profile) 139SvPROFILE (SV *profile)
132{ 140{
133 if (!SvOK (profile)) 141 if (!SvOK (profile))
134 profile = default_profile; 142 return default_profile;
135 143
136 if (!SvROK (profile)) 144 if (!SvROK (profile))
137 croak ("invalid profile"); 145 croak ("invalid profile");
138 146
139 profile = SvRV (profile); 147 profile = SvRV (profile);
… …
154 return BER_TYPE_BYTES; 162 return BER_TYPE_BYTES;
155 163
156 return SvPVX (sv)[idx]; 164 return SvPVX (sv)[idx];
157} 165}
158 166
159static int 167static void
160profile_set (profile_type *profile, int klass, int tag, int type) 168profile_set (profile_type *profile, int klass, int tag, int type)
161{ 169{
162 SV *sv = (SV *)profile; 170 SV *sv = (SV *)profile;
163 U32 idx = (tag << 2) + klass; 171 U32 idx = (tag << 2) + klass;
164 STRLEN oldlen = SvCUR (sv); 172 STRLEN oldlen = SvCUR (sv);
… …
173 181
174 SvPVX (sv)[idx] = type; 182 SvPVX (sv)[idx] = type;
175} 183}
176 184
177static SV * 185static SV *
178profile_new () 186profile_new (void)
179{ 187{
180 SV *sv = newSVpvn ("", 0); 188 SV *sv = newSVpvn ("", 0);
181 189
182 static const struct { 190 static const struct {
183 int klass; 191 int klass;
184 int tag; 192 int tag;
185 int type; 193 int type;
186 } *celem, default_map[] = { 194 } *celem, default_map[] = {
187 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL }, 195 { ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
188 { ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT }, 196 { ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
189 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL }, 197 { ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
190 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID }, 198 { ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },
191 { ASN_UNIVERSAL, ASN_OBJECT_DESCRIPTOR, BER_TYPE_OID },
192 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID }, 199 { ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
193 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL }, 200 { ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
201 { ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
194 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 }, 202 { ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
195 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 }, 203 { ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
196 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 }, 204 { ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
197 }; 205 };
198 206
199 //const_iv (SNMP_IPADDRESS)
200 //const_iv (SNMP_COUNTER32)
201 //const_iv (SNMP_UNSIGNED32)
202 //const_iv (SNMP_TIMETICKS)
203 //const_iv (SNMP_OPAQUE)
204 //const_iv (SNMP_COUNTER64)
205
206 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; )
207 profile_set ((void *)sv, celem->klass, celem->tag, celem->type); 208 profile_set ((profile_type *)sv, celem->klass, celem->tag, celem->type);
208 209
209 return sv_bless (newRV_noinc (sv), profile_stash); 210 return sv_bless (newRV_noinc (sv), profile_stash);
210} 211}
211 212
212///////////////////////////////////////////////////////////////////////////// 213/////////////////////////////////////////////////////////////////////////////
… …
247 248
248 return *cur++; 249 return *cur++;
249} 250}
250 251
251// get ber-encoded integer (i.e. pack "w") 252// get ber-encoded integer (i.e. pack "w")
252static U32 253static UV
253get_w (void) 254get_w (void)
254{ 255{
255 U32 res = 0; 256 UV res = 0;
256 257
257 for (;;) 258 for (;;)
258 { 259 {
259 U8 c = get_u8 (); 260 U8 c = get_u8 ();
260 res = (res << 7) | (c & 0x7f); 261 res = (res << 7) | (c & 0x7f);
… …
262 if (!(c & 0x80)) 263 if (!(c & 0x80))
263 return res; 264 return res;
264 } 265 }
265} 266}
266 267
267static U32 268static UV
268get_length (void) 269get_length (void)
269{ 270{
270 U32 res = get_u8 (); 271 UV res = get_u8 ();
271 272
272 if (res & 0x80) 273 if (res & 0x80)
273 { 274 {
274 int cnt = res & 0x7f; 275 int cnt = res & 0x7f;
275 res = 0; 276 res = 0;
… …
282 283
283 default: 284 default:
284 error ("ASN.1 length too long"); 285 error ("ASN.1 length too long");
285 return 0; 286 return 0;
286 287
288 case 8: res = (res << 8) | get_u8 ();
289 case 7: res = (res << 8) | get_u8 ();
290 case 6: res = (res << 8) | get_u8 ();
291 case 5: res = (res << 8) | get_u8 ();
287 case 4: res = (res << 8) | get_u8 (); 292 case 4: res = (res << 8) | get_u8 ();
288 case 3: res = (res << 8) | get_u8 (); 293 case 3: res = (res << 8) | get_u8 ();
289 case 2: res = (res << 8) | get_u8 (); 294 case 2: res = (res << 8) | get_u8 ();
290 case 1: res = (res << 8) | get_u8 (); 295 case 1: res = (res << 8) | get_u8 ();
291 } 296 }
… …
293 298
294 return res; 299 return res;
295} 300}
296 301
297static SV * 302static SV *
298decode_int () 303decode_int (void)
299{ 304{
300 int len = get_length (); 305 UV len = get_length ();
301 306
302 if (len <= 0) 307 if (!len)
303 { 308 {
304 error ("integer length equal to zero"); 309 error ("invalid integer length equal to zero");
305 return 0; 310 return 0;
306 } 311 }
307 312
308 U8 *data = get_n (len); 313 U8 *data = get_n (len);
309 314
… …
313 318
314 do 319 do
315 val = (val << 8) | *data++; 320 val = (val << 8) | *data++;
316 while (--len); 321 while (--len);
317 322
318 // the cats to IV relies on implementation-defined behaviour (two's complement cast) 323 // the cast to IV relies on implementation-defined behaviour (two's complement cast)
319 // but that's ok, as perl relies on it as well. 324 // but that's ok, as perl relies on it as well.
320 return negative ? newSViv ((IV)val) : newSVuv (val); 325 return negative ? newSViv ((IV)val) : newSVuv (val);
321} 326}
322 327
323static SV * 328static SV *
324decode_data (void) 329decode_data (void)
325{ 330{
326 U32 len = get_length (); 331 UV len = get_length ();
327 U8 *data = get_n (len);
328 return newSVpvn ((char *)data, len); 332 return newSVpvn ((char *)get_n (len), len);
329} 333}
330 334
331// gelper for decode_object_identifier 335// helper for decode_object_identifier
332static char * 336static char *
333write_uv (char *buf, U32 u) 337write_uv (char *buf, UV u)
334{ 338{
335 // the one-digit case is absolutely predominant, so this pays off (hopefully) 339 // the one-digit case is absolutely predominant, so this pays off (hopefully)
336 if (expect_true (u < 10)) 340 if (expect_true (u < 10))
337 *buf++ = u + '0'; 341 *buf++ = u + '0';
338 else 342 else
339 { 343 {
344 // this *could* be done much faster using branchless fixed-point arithmetics
340 char *beg = buf; 345 char *beg = buf;
341 346
342 do 347 do
343 { 348 {
344 *buf++ = u % 10 + '0'; 349 *buf++ = u % 10 + '0';
345 u /= 10; 350 u /= 10;
346 } 351 }
347 while (u); 352 while (u);
348 353
349 // reverse digits 354 // reverse digits
350 for (char *ptr = buf; --ptr != beg; ++beg) 355 char *ptr = buf;
356 while (--ptr > beg)
351 { 357 {
352 char c = *ptr; 358 char c = *ptr;
353 *ptr = *beg; 359 *ptr = *beg;
354 *beg = c; 360 *beg = c;
361 ++beg;
355 } 362 }
356 } 363 }
357 364
358 return buf; 365 return buf;
359} 366}
360 367
361static SV * 368static SV *
362decode_oid (int relative) 369decode_oid (int relative)
363{ 370{
364 U32 len = get_length (); 371 UV len = get_length ();
365 372
366 if (len <= 0) 373 if (len <= 0)
367 { 374 {
368 error ("OBJECT IDENTIFIER length equal to zero"); 375 error ("OBJECT IDENTIFIER length equal to zero");
369 return &PL_sv_undef; 376 return &PL_sv_undef;
370 } 377 }
371 378
372 U8 *end = cur + len; 379 U8 *end = cur + len;
373 U32 w = get_w (); 380 UV w = get_w ();
374 381
375 static char oid[MAX_OID_STRLEN]; // must be static 382 static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
376 char *app = oid; 383 char *app = oid;
377 384
378 if (relative) 385 if (relative)
379 app = write_uv (app, w); 386 app = write_uv (app, w);
380 else 387 else
… …
382 app = write_uv (app, (U8)w / 40); 389 app = write_uv (app, (U8)w / 40);
383 *app++ = '.'; 390 *app++ = '.';
384 app = write_uv (app, (U8)w % 40); 391 app = write_uv (app, (U8)w % 40);
385 } 392 }
386 393
394 while (cur < end)
395 {
387 // we assume an oid component is never > 64 bytes 396 // we assume an oid component is never > 64 digits
388 while (cur < end && oid + sizeof (oid) - app > 64) 397 if (oid + sizeof (oid) - app < 64)
389 { 398 croak ("BER_TYPE_OID to long to decode");
399
390 w = get_w (); 400 w = get_w ();
391 *app++ = '.'; 401 *app++ = '.';
392 app = write_uv (app, w); 402 app = write_uv (app, w);
393 } 403 }
394 404
395 return newSVpvn (oid, app - oid); 405 return newSVpvn (oid, app - oid);
396} 406}
397 407
408// TODO: this is unacceptably slow
398static SV * 409static SV *
410decode_ucs (int chrsize)
411{
412 SV *res = NEWSV (0, 0);
413
414 UV len = get_length ();
415
416 if (len & (chrsize - 1))
417 croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
418
419 while (len)
420 {
421 U8 b1 = get_u8 ();
422 U8 b2 = get_u8 ();
423 U32 chr = (b1 << 8) | b2;
424
425 if (chrsize == 4)
426 {
427 U8 b3 = get_u8 ();
428 U8 b4 = get_u8 ();
429 chr = (chr << 16) | (b3 << 8) | b4;
430 }
431
432 U8 uchr [UTF8_MAXBYTES];
433 int uclen = uvuni_to_utf8 (uchr, chr) - uchr;
434
435 sv_catpvn (res, (const char *)uchr, uclen);
436 len -= chrsize;
437 }
438
439 SvUTF8_on (res);
440
441 return res;
442}
443
444static SV *
399decode_ber () 445decode_ber (void)
400{ 446{
401 int identifier = get_u8 (); 447 int identifier = get_u8 ();
402 448
403 SV *res; 449 SV *res;
404 450
… …
412 if (tag == ASN_TAG_BER) 458 if (tag == ASN_TAG_BER)
413 tag = get_w (); 459 tag = get_w ();
414 460
415 if (constructed) 461 if (constructed)
416 { 462 {
417 U32 len = get_length (); 463 UV len = get_length ();
418 U32 seqend = (cur - buf) + len; 464 UV seqend = (cur - buf) + len;
419 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); 465 AV *av = (AV *)sv_2mortal ((SV *)newAV ());
420 466
421 while (cur < buf + seqend) 467 while (cur < buf + seqend)
422 av_push (av, decode_ber ()); 468 av_push (av, decode_ber ());
423 469
… …
428 } 474 }
429 else 475 else
430 switch (profile_lookup (cur_profile, klass, tag)) 476 switch (profile_lookup (cur_profile, klass, tag))
431 { 477 {
432 case BER_TYPE_NULL: 478 case BER_TYPE_NULL:
479 {
480 UV len = get_length ();
481
482 if (len)
483 croak ("BER_TYPE_NULL value with non-zero length %d encountered", len);
484
433 res = &PL_sv_undef; 485 res = &PL_sv_undef;
486 }
434 break; 487 break;
435 488
436 case BER_TYPE_BOOL: 489 case BER_TYPE_BOOL:
437 { 490 {
438 U32 len = get_length (); 491 UV len = get_length ();
439 492
440 if (len != 1) 493 if (len != 1)
441 croak ("BOOLEAN type with invalid length %d encountered", len); 494 croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len);
442 495
443 res = newSVcacheint (get_u8 () ? 0 : 1); 496 res = newSVcacheint (!!get_u8 ());
444 } 497 }
445 break; 498 break;
446 499
447 case BER_TYPE_OID: 500 case BER_TYPE_OID:
448 res = decode_oid (0); 501 res = decode_oid (0);
… …
463 516
464 case BER_TYPE_BYTES: 517 case BER_TYPE_BYTES:
465 res = decode_data (); 518 res = decode_data ();
466 break; 519 break;
467 520
521 case BER_TYPE_IPADDRESS:
522 {
523 UV len = get_length ();
524
525 if (len != 4)
526 croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len);
527
528 U8 c1 = get_u8 ();
529 U8 c2 = get_u8 ();
530 U8 c3 = get_u8 ();
531 U8 c4 = get_u8 ();
532
533 res = newSVpvf ("%d.%d.%d.%d", c1, c2, c3, c4);
534 }
535 break;
536
537 case BER_TYPE_UCS2:
538 res = decode_ucs (2);
539 break;
540
541 case BER_TYPE_UCS4:
542 res = decode_ucs (4);
543 break;
544
468 case BER_TYPE_REAL: 545 case BER_TYPE_REAL:
469 case BER_TYPE_UCS2:
470 case BER_TYPE_UCS4:
471 case BER_TYPE_CROAK: 546 case BER_TYPE_CROAK:
472 default: 547 default:
473 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 548 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
474 } 549 }
475 550
476 AV *av = newAV (); 551 AV *av = newAV ();
477 av_fill (av, BER_ARRAYSIZE - 1); 552 av_fill (av, BER_ARRAYSIZE - 1);
478 AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass); 553 AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
479 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag); 554 AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
480 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0); 555 AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
481 AvARRAY (av)[BER_DATA ] = res; 556 AvARRAY (av)[BER_DATA ] = res;
482 557
483 return newRV_noinc ((SV *)av); 558 return newRV_noinc ((SV *)av);
484} 559}
485 560
486///////////////////////////////////////////////////////////////////////////// 561/////////////////////////////////////////////////////////////////////////////
… …
501static void 576static void
502set_buf (SV *sv) 577set_buf (SV *sv)
503{ 578{
504 STRLEN len; 579 STRLEN len;
505 buf_sv = sv; 580 buf_sv = sv;
506 buf = SvPVbyte (buf_sv, len); 581 buf = (U8 *)SvPVbyte (buf_sv, len);
507 cur = buf; 582 cur = buf;
508 end = buf + len; 583 end = buf + len;
509} 584}
510 585
511/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */ 586/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
… …
525need (STRLEN len) 600need (STRLEN len)
526{ 601{
527 if (expect_false ((uintptr_t)(end - cur) < len)) 602 if (expect_false ((uintptr_t)(end - cur) < len))
528 { 603 {
529 STRLEN pos = cur - buf; 604 STRLEN pos = cur - buf;
530 buf = my_sv_grow (buf_sv, pos, len); 605 buf = (U8 *)my_sv_grow (buf_sv, pos, len);
531 cur = buf + pos; 606 cur = buf + pos;
532 end = buf + SvLEN (buf_sv) - 1; 607 end = buf + SvLEN (buf_sv) - 1;
533 } 608 }
534} 609}
535 610
… …
539 need (1); 614 need (1);
540 *cur++ = val; 615 *cur++ = val;
541} 616}
542 617
543static void 618static void
544put_w_nocheck (U32 val) 619put_w_nocheck (UV val)
545{ 620{
621#if UVSIZE > 4
622 *cur = (val >> 7 * 9) | 0x80; cur += val >= ((UV)1 << (7 * 9));
623 *cur = (val >> 7 * 8) | 0x80; cur += val >= ((UV)1 << (7 * 8));
624 *cur = (val >> 7 * 7) | 0x80; cur += val >= ((UV)1 << (7 * 7));
625 *cur = (val >> 7 * 6) | 0x80; cur += val >= ((UV)1 << (7 * 6));
626 *cur = (val >> 7 * 5) | 0x80; cur += val >= ((UV)1 << (7 * 5));
627#endif
546 *cur = (val >> 7 * 4) | 0x80; cur += val >= (1 << (7 * 4)); 628 *cur = (val >> 7 * 4) | 0x80; cur += val >= ((UV)1 << (7 * 4));
547 *cur = (val >> 7 * 3) | 0x80; cur += val >= (1 << (7 * 3)); 629 *cur = (val >> 7 * 3) | 0x80; cur += val >= ((UV)1 << (7 * 3));
548 *cur = (val >> 7 * 2) | 0x80; cur += val >= (1 << (7 * 2)); 630 *cur = (val >> 7 * 2) | 0x80; cur += val >= ((UV)1 << (7 * 2));
549 *cur = (val >> 7 * 1) | 0x80; cur += val >= (1 << (7 * 1)); 631 *cur = (val >> 7 * 1) | 0x80; cur += val >= ((UV)1 << (7 * 1));
550 *cur = val & 0x7f; cur += 1; 632 *cur = val & 0x7f; cur += 1;
551} 633}
552 634
553static void 635static void
554put_w (U32 val) 636put_w (UV val)
555{ 637{
556 need (5); // we only handle up to 5 bytes 638 need (5); // we only handle up to 5 bytes
557 639
558 put_w_nocheck (val); 640 put_w_nocheck (val);
559} 641}
560 642
561static U8 * 643static U8 *
562put_length_at (U32 val, U8 *cur) 644put_length_at (UV val, U8 *cur)
563{ 645{
564 if (val < 0x7fU) 646 if (val < 0x7fU)
565 *cur++ = val; 647 *cur++ = val;
566 else 648 else
567 { 649 {
568 U8 *lenb = cur++; 650 U8 *lenb = cur++;
569 651
652#if UVSIZE > 4
653 *cur = val >> 56; cur += *cur > 0;
654 *cur = val >> 48; cur += *cur > 0;
655 *cur = val >> 40; cur += *cur > 0;
656 *cur = val >> 32; cur += *cur > 0;
657#endif
570 *cur = val >> 24; cur += *cur > 0; 658 *cur = val >> 24; cur += *cur > 0;
571 *cur = val >> 16; cur += *cur > 0; 659 *cur = val >> 16; cur += *cur > 0;
572 *cur = val >> 8; cur += *cur > 0; 660 *cur = val >> 8; cur += *cur > 0;
573 *cur = val ; cur += 1; 661 *cur = val ; cur += 1;
574 662
… …
577 665
578 return cur; 666 return cur;
579} 667}
580 668
581static void 669static void
582put_length (U32 val) 670put_length (UV val)
583{ 671{
584 need (5); 672 need (5 + val);
585 cur = put_length_at (val, cur); 673 cur = put_length_at (val, cur);
586} 674}
587 675
588// return how many bytes the encoded length requires 676// return how many bytes the encoded length requires
589static int length_length (U32 val) 677static int length_length (UV val)
590{ 678{
591 return val < 0x7fU 679 return val < 0x7fU
592 ? 1 680 ? 1
593 : 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU); 681 : 2
682 + (val > 0xffU)
683 + (val > 0xffffU)
684 + (val > 0xffffffU)
685#if UVSIZE > 4
686 + (val > 0xffffffffU)
687 + (val > 0xffffffffffU)
688 + (val > 0xffffffffffffU)
689 + (val > 0xffffffffffffffU)
690#endif
691 ;
594} 692}
595 693
596static void 694static void
597encode_data (const char *ptr, STRLEN len) 695encode_data (const char *ptr, STRLEN len)
598{ 696{
599 put_length (len); 697 put_length (len);
600 need (len);
601 memcpy (cur, ptr, len); 698 memcpy (cur, ptr, len);
602 cur += len; 699 cur += len;
603} 700}
604 701
605static void 702static void
… …
661 758
662 *lenb = cur - lenb - 1; 759 *lenb = cur - lenb - 1;
663} 760}
664 761
665// we don't know the length yet, so we optimistically 762// we don't know the length yet, so we optimistically
666// assume the length will need one octet later. if that 763// assume the length will need one octet later. If that
667// turns out to be wrong, we memove as needed. 764// turns out to be wrong, we memmove as needed.
668// mark the beginning 765// mark the beginning
669static STRLEN 766static STRLEN
670len_fixup_mark () 767len_fixup_mark (void)
671{ 768{
672 return cur++ - buf; 769 return cur++ - buf;
673} 770}
674 771
675// patch up the length 772// patch up the length
… …
751 848
752 return (AV *)rv; 849 return (AV *)rv;
753} 850}
754 851
755static void 852static void
853encode_ucs (SV *data, int chrsize)
854{
855 STRLEN uchars = sv_len_utf8 (data);
856 STRLEN len;;
857 char *ptr = SvPVutf8 (data, len);
858
859 put_length (uchars * chrsize);
860
861 while (uchars--)
862 {
863 STRLEN uclen;
864 UV uchr = utf8_to_uvchr_buf ((U8 *)ptr, (U8 *)ptr + len, &uclen);
865
866 ptr += uclen;
867 len -= uclen;
868
869 if (chrsize == 4)
870 {
871 *cur++ = uchr >> 24;
872 *cur++ = uchr >> 16;
873 }
874
875 *cur++ = uchr >> 8;
876 *cur++ = uchr;
877 }
878}
879static void
756encode_ber (SV *tuple) 880encode_ber (SV *tuple)
757{ 881{
758 AV *av = ber_tuple (tuple); 882 AV *av = ber_tuple (tuple);
759 883
760 int klass = SvIV (AvARRAY (av)[BER_CLASS]); 884 int klass = SvIV (AvARRAY (av)[BER_CLASS]);
761 int tag = SvIV (AvARRAY (av)[BER_TAG]); 885 int tag = SvIV (AvARRAY (av)[BER_TAG]);
762 int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0; 886 int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
763 SV *data = AvARRAY (av)[BER_DATA]; 887 SV *data = AvARRAY (av)[BER_DATA];
764 888
765 int identifier = (klass << ASN_CLASS_SHIFT) | constructed; 889 int identifier = (klass << ASN_CLASS_SHIFT) | constructed;
766 890
767 if (expect_false (tag >= ASN_TAG_BER)) 891 if (expect_false (tag >= ASN_TAG_BER))
… …
786 int fill = AvFILL (av); 910 int fill = AvFILL (av);
787 911
788 if (expect_false (SvRMAGICAL (av))) 912 if (expect_false (SvRMAGICAL (av)))
789 croak ("BER constructed data must not be tied"); 913 croak ("BER constructed data must not be tied");
790 914
915 int i;
791 for (int i = 0; i <= fill; ++i) 916 for (i = 0; i <= fill; ++i)
792 encode_ber (AvARRAY (av)[i]); 917 encode_ber (AvARRAY (av)[i]);
793 918
794 len_fixup (mark); 919 len_fixup (mark);
795 } 920 }
796 else 921 else
… …
800 put_length (0); 925 put_length (0);
801 break; 926 break;
802 927
803 case BER_TYPE_BOOL: 928 case BER_TYPE_BOOL:
804 put_length (1); 929 put_length (1);
805 put_u8 (SvTRUE (data) ? 0xff : 0x00); 930 *cur++ = SvTRUE (data) ? 0xff : 0x00;
806 break; 931 break;
807 932
808 case BER_TYPE_OID: 933 case BER_TYPE_OID:
809 encode_oid (data, 0); 934 encode_oid (data, 0);
810 break; 935 break;
… …
831 const char *ptr = SvPVutf8 (data, len); 956 const char *ptr = SvPVutf8 (data, len);
832 encode_data (ptr, len); 957 encode_data (ptr, len);
833 } 958 }
834 break; 959 break;
835 960
961 case BER_TYPE_IPADDRESS:
962 {
963 U8 ip[4];
964 sscanf (SvPV_nolen (data), "%hhu.%hhu.%hhu.%hhu", ip + 0, ip + 1, ip + 2, ip + 3);
965 encode_data ((const char *)ip, sizeof (ip));
966 }
967 break;
968
969 case BER_TYPE_UCS2:
970 encode_ucs (data, 2);
971 break;
972
973 case BER_TYPE_UCS4:
974 encode_ucs (data, 4);
975 break;
976
836 case BER_TYPE_REAL: 977 case BER_TYPE_REAL:
837 case BER_TYPE_UCS2:
838 case BER_TYPE_UCS4:
839 case BER_TYPE_CROAK: 978 case BER_TYPE_CROAK:
840 default: 979 default:
841 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag); 980 croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
842 } 981 }
843 982
… …
859 const char *name; 998 const char *name;
860 IV iv; 999 IV iv;
861 } *civ, const_iv[] = { 1000 } *civ, const_iv[] = {
862#define const_iv(name) { # name, name }, 1001#define const_iv(name) { # name, name },
863 const_iv (ASN_BOOLEAN) 1002 const_iv (ASN_BOOLEAN)
864 const_iv (ASN_INTEGER32) 1003 const_iv (ASN_INTEGER)
865 const_iv (ASN_BIT_STRING) 1004 const_iv (ASN_BIT_STRING)
866 const_iv (ASN_OCTET_STRING) 1005 const_iv (ASN_OCTET_STRING)
867 const_iv (ASN_NULL) 1006 const_iv (ASN_NULL)
868 const_iv (ASN_OBJECT_IDENTIFIER) 1007 const_iv (ASN_OBJECT_IDENTIFIER)
869 const_iv (ASN_OBJECT_DESCRIPTOR) 1008 const_iv (ASN_OBJECT_DESCRIPTOR)
… …
898 const_iv (ASN_CONTEXT) 1037 const_iv (ASN_CONTEXT)
899 const_iv (ASN_PRIVATE) 1038 const_iv (ASN_PRIVATE)
900 1039
901 const_iv (BER_CLASS) 1040 const_iv (BER_CLASS)
902 const_iv (BER_TAG) 1041 const_iv (BER_TAG)
903 const_iv (BER_CONSTRUCTED) 1042 const_iv (BER_FLAGS)
904 const_iv (BER_DATA) 1043 const_iv (BER_DATA)
905 1044
906 const_iv (BER_TYPE_BYTES) 1045 const_iv (BER_TYPE_BYTES)
907 const_iv (BER_TYPE_UTF8) 1046 const_iv (BER_TYPE_UTF8)
908 const_iv (BER_TYPE_UCS2) 1047 const_iv (BER_TYPE_UCS2)
… …
911 const_iv (BER_TYPE_OID) 1050 const_iv (BER_TYPE_OID)
912 const_iv (BER_TYPE_RELOID) 1051 const_iv (BER_TYPE_RELOID)
913 const_iv (BER_TYPE_NULL) 1052 const_iv (BER_TYPE_NULL)
914 const_iv (BER_TYPE_BOOL) 1053 const_iv (BER_TYPE_BOOL)
915 const_iv (BER_TYPE_REAL) 1054 const_iv (BER_TYPE_REAL)
1055 const_iv (BER_TYPE_IPADDRESS)
916 const_iv (BER_TYPE_CROAK) 1056 const_iv (BER_TYPE_CROAK)
917 1057
918 const_iv (SNMP_IPADDRESS) 1058 const_iv (SNMP_IPADDRESS)
919 const_iv (SNMP_COUNTER32) 1059 const_iv (SNMP_COUNTER32)
920 const_iv (SNMP_UNSIGNED32) 1060 const_iv (SNMP_UNSIGNED32)
921 const_iv (SNMP_TIMETICKS) 1061 const_iv (SNMP_TIMETICKS)
922 const_iv (SNMP_OPAQUE) 1062 const_iv (SNMP_OPAQUE)
923 const_iv (SNMP_COUNTER64) 1063 const_iv (SNMP_COUNTER64)
924
925 }; 1064 };
926 1065
927 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1066 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
928 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1067 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
929
930 default_profile = profile_new ();
931} 1068}
932 1069
933SV * 1070SV *
934ber_decode (SV *ber, SV *profile = &PL_sv_undef) 1071ber_decode (SV *ber, SV *profile = &PL_sv_undef)
935 CODE: 1072 CODE:
936{ 1073{
937 cur_profile = SvPROFILE (profile); 1074 cur_profile = SvPROFILE (profile);
938 STRLEN len; 1075 STRLEN len;
939 buf = SvPVbyte (ber, len); 1076 buf = (U8 *)SvPVbyte (ber, len);
940 cur = buf; 1077 cur = buf;
941 end = buf + len; 1078 end = buf + len;
942 1079
943 RETVAL = decode_ber (); 1080 RETVAL = decode_ber ();
944} 1081}
945 OUTPUT: RETVAL 1082 OUTPUT: RETVAL
946 1083
947void 1084void
948ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *constructed = &PL_sv_undef, SV *data = &PL_sv_undef) 1085ber_is (SV *tuple, SV *klass = &PL_sv_undef, SV *tag = &PL_sv_undef, SV *flags = &PL_sv_undef, SV *data = &PL_sv_undef)
949 PPCODE: 1086 PPCODE:
950{ 1087{
951 if (!SvOK (tuple)) 1088 if (!SvOK (tuple))
952 XSRETURN_NO; 1089 XSRETURN_NO;
953 1090
… …
955 croak ("ber_is: tuple must be BER tuple (array-ref)"); 1092 croak ("ber_is: tuple must be BER tuple (array-ref)");
956 1093
957 AV *av = (AV *)SvRV (tuple); 1094 AV *av = (AV *)SvRV (tuple);
958 1095
959 XPUSHs ( 1096 XPUSHs (
960 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass)) 1097 (!SvOK (klass) || SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
961 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag)) 1098 && (!SvOK (tag) || SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
962 && (!SvOK (constructed) || !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed)) 1099 && (!SvOK (flags) || !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
963 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data)) 1100 && (!SvOK (data) || sv_eq (AvARRAY (av)[BER_DATA ], data))
964 ? &PL_sv_yes : &PL_sv_undef); 1101 ? &PL_sv_yes : &PL_sv_undef);
965} 1102}
966 1103
967void 1104void
968ber_is_seq (SV *tuple) 1105ber_is_seq (SV *tuple)
… …
972 XSRETURN_UNDEF; 1109 XSRETURN_UNDEF;
973 1110
974 AV *av = ber_tuple (tuple); 1111 AV *av = ber_tuple (tuple);
975 1112
976 XPUSHs ( 1113 XPUSHs (
977 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1114 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
978 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE 1115 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
979 && SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1116 && SvIV (AvARRAY (av)[BER_FLAGS])
980 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef); 1117 ? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
981} 1118}
982 1119
983void 1120void
984ber_is_i32 (SV *tuple, SV *value = &PL_sv_undef) 1121ber_is_int (SV *tuple, SV *value = &PL_sv_undef)
985 PPCODE: 1122 PPCODE:
986{ 1123{
987 if (!SvOK (tuple)) 1124 if (!SvOK (tuple))
988 XSRETURN_NO; 1125 XSRETURN_NO;
989 1126
990 AV *av = ber_tuple (tuple); 1127 AV *av = ber_tuple (tuple);
991 1128
992 IV data = SvIV (AvARRAY (av)[BER_DATA]); 1129 UV data = SvUV (AvARRAY (av)[BER_DATA]);
993 1130
994 XPUSHs ( 1131 XPUSHs (
995 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1132 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
996 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32 1133 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
997 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1134 && !SvIV (AvARRAY (av)[BER_FLAGS])
998 && (!SvOK (value) || data == SvIV (value)) 1135 && (!SvOK (value) || data == SvUV (value))
999 ? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0)) 1136 ? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1000 : &PL_sv_undef); 1137 : &PL_sv_undef);
1001} 1138}
1002 1139
1003void 1140void
1004ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef) 1141ber_is_oid (SV *tuple, SV *oid = &PL_sv_undef)
… …
1008 XSRETURN_NO; 1145 XSRETURN_NO;
1009 1146
1010 AV *av = ber_tuple (tuple); 1147 AV *av = ber_tuple (tuple);
1011 1148
1012 XPUSHs ( 1149 XPUSHs (
1013 SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL 1150 SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1014 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER 1151 && SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1015 && !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) 1152 && !SvIV (AvARRAY (av)[BER_FLAGS])
1016 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid)) 1153 && (!SvOK (oid) || sv_eq (AvARRAY (av)[BER_DATA], oid))
1017 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef); 1154 ? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1018} 1155}
1019 1156
1020############################################################################# 1157#############################################################################
… …
1033 SvCUR_set (buf_sv, cur - buf); 1170 SvCUR_set (buf_sv, cur - buf);
1034 XPUSHs (buf_sv); 1171 XPUSHs (buf_sv);
1035} 1172}
1036 1173
1037SV * 1174SV *
1038ber_i32 (IV iv) 1175ber_int (SV *sv)
1039 CODE: 1176 CODE:
1040{ 1177{
1041 AV *av = newAV (); 1178 AV *av = newAV ();
1042 av_fill (av, BER_ARRAYSIZE - 1); 1179 av_fill (av, BER_ARRAYSIZE - 1);
1043 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1180 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1044 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32); 1181 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1045 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0); 1182 AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1046 AvARRAY (av)[BER_DATA ] = newSViv (iv); 1183 AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1047 RETVAL = newRV_noinc ((SV *)av); 1184 RETVAL = newRV_noinc ((SV *)av);
1048} 1185}
1049 OUTPUT: RETVAL 1186 OUTPUT: RETVAL
1050 1187
1051# TODO: not arrayref, but elements? 1188# TODO: not arrayref, but elements?
… …
1053ber_seq (SV *arrayref) 1190ber_seq (SV *arrayref)
1054 CODE: 1191 CODE:
1055{ 1192{
1056 AV *av = newAV (); 1193 AV *av = newAV ();
1057 av_fill (av, BER_ARRAYSIZE - 1); 1194 av_fill (av, BER_ARRAYSIZE - 1);
1058 AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL); 1195 AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1059 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE); 1196 AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1060 AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1); 1197 AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1061 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref); 1198 AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1062 RETVAL = newRV_noinc ((SV *)av); 1199 RETVAL = newRV_noinc ((SV *)av);
1063} 1200}
1064 OUTPUT: RETVAL 1201 OUTPUT: RETVAL
1065 1202
1066MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile 1203MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile
… …
1069new (SV *klass) 1206new (SV *klass)
1070 CODE: 1207 CODE:
1071 RETVAL = profile_new (); 1208 RETVAL = profile_new ();
1072 OUTPUT: RETVAL 1209 OUTPUT: RETVAL
1073 1210
1211void
1212set (SV *profile, int klass, int tag, int type)
1213 CODE:
1214 profile_set (SvPROFILE (profile), klass, tag, type);
1215
1216IV
1217get (SV *profile, int klass, int tag)
1218 CODE:
1219 RETVAL = profile_lookup (SvPROFILE (profile), klass, tag);
1220 OUTPUT: RETVAL
1221
1222void
1223_set_default (SV *profile)
1224 CODE:
1225 default_profile = SvPROFILE (profile);
1226
1227

Diff Legend

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