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.24 by root, Sun Apr 21 01:58:15 2019 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines