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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines