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.27 by root, Mon Apr 22 11:01:49 2019 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines