[ViewVC] Diff of: cvs/Convert-BER-XS/XS.xs

Comparing Convert-BER-XS/XS.xs (file contents):
Revision 1.13 by root, Sat Apr 20 13:46:14 2019 UTC vs.
Revision 1.29 by root, Tue Apr 23 19:44:12 2019 UTC

…		…
8	// sscanf format modifiers and more.	8	// sscanf format modifiers and more.
9		9
10	enum {	10	enum {
11	// ASN_TAG	11	// ASN_TAG
12	ASN_BOOLEAN = 0x01,	12	ASN_BOOLEAN = 0x01,
13	ASN_INTEGER32 = 0x02,	13	ASN_INTEGER = 0x02,
14	ASN_BIT_STRING = 0x03,	14	ASN_BIT_STRING = 0x03,
15	ASN_OCTET_STRING = 0x04,	15	ASN_OCTET_STRING = 0x04,
16	ASN_NULL = 0x05,	16	ASN_NULL = 0x05,
17	ASN_OBJECT_IDENTIFIER = 0x06,	17	ASN_OBJECT_IDENTIFIER = 0x06,
18	ASN_OID = 0x06,	18	ASN_OID = 0x06,
…		…
58	ASN_CLASS_SHIFT = 6,	58	ASN_CLASS_SHIFT = 6,
59		59
60	// ASN_APPLICATION SNMP	60	// ASN_APPLICATION SNMP
61	SNMP_IPADDRESS = 0x00,	61	SNMP_IPADDRESS = 0x00,
62	SNMP_COUNTER32 = 0x01,	62	SNMP_COUNTER32 = 0x01,
		63	SNMP_GAUGE32 = 0x02,
63	SNMP_UNSIGNED32 = 0x02,	64	SNMP_UNSIGNED32 = 0x02,
64	SNMP_TIMETICKS = 0x03,	65	SNMP_TIMETICKS = 0x03,
65	SNMP_OPAQUE = 0x04,	66	SNMP_OPAQUE = 0x04,
66	SNMP_COUNTER64 = 0x06,	67	SNMP_COUNTER64 = 0x06,
67	};	68	};
…		…
80	BER_TYPE_IPADDRESS,	81	BER_TYPE_IPADDRESS,
81	BER_TYPE_CROAK,	82	BER_TYPE_CROAK,
82	};	83	};
83		84
84	enum {	85	enum {
85	BER_CLASS = 0,	86	BER_CLASS = 0,
86	BER_TAG = 1,	87	BER_TAG = 1,
87	BER_CONSTRUCTED = 2,	88	BER_FLAGS = 2,
88	BER_DATA = 3,	89	BER_DATA = 3,
89	BER_ARRAYSIZE	90	BER_ARRAYSIZE
90	};	91	};
91		92
92	#define MAX_OID_STRLEN 4096	93	#define MAX_OID_STRLEN 4096
93		94
…		…
140	{	141	{
141	if (!SvOK (profile))	142	if (!SvOK (profile))
142	return default_profile;	143	return default_profile;
143		144
144	if (!SvROK (profile))	145	if (!SvROK (profile))
145	croak ("invalid profile");	146	croak ("Convert::BER::XS::Profile expected");
146		147
147	profile = SvRV (profile);	148	profile = SvRV (profile);
148		149
149	if (SvSTASH (profile) != profile_stash)	150	if (SvSTASH (profile) != profile_stash)
150	croak ("invalid profile object");	151	croak ("Convert::BER::XS::Profile expected");
151		152
152	return (void *)profile;	153	return (void *)profile;
153	}	154	}
154		155
155	static int	156	static int
…		…
181		182
182	SvPVX (sv)[idx] = type;	183	SvPVX (sv)[idx] = type;
183	}	184	}
184		185
185	static SV *	186	static SV *
186	profile_new ()	187	profile_new (void)
187	{	188	{
188	SV *sv = newSVpvn ("", 0);	189	SV *sv = newSVpvn ("", 0);
189		190
190	static const struct {	191	static const struct {
191	int klass;	192	int klass;
192	int tag;	193	int tag;
193	int type;	194	int type;
194	} *celem, default_map[] = {	195	} *celem, default_map[] = {
195	{ ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },	196	{ ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
196	{ ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT },	197	{ ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
197	{ ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },	198	{ ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
198	{ ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },	199	{ ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },
199	{ ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },	200	{ ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
200	{ ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },	201	{ ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
201	{ ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },	202	{ ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
…		…
227	}	228	}
228		229
229	// get_* functions fetch something from the buffer	230	// get_* functions fetch something from the buffer
230	// decode_* functions use get_* fun ctions to decode ber values	231	// decode_* functions use get_* fun ctions to decode ber values
231		232
		233	// get single octet
		234	static U8
		235	get_u8 (void)
		236	{
		237	if (cur == end)
		238	error ("unexpected end of message buffer");
		239
		240	return *cur++;
		241	}
		242
232	// get n octets	243	// get n octets
233	static U8 *	244	static U8 *
234	get_n (UV count)	245	get_n (UV count)
235	{	246	{
236	want (count);	247	want (count);
237	U8 *res = cur;	248	U8 *res = cur;
238	cur += count;	249	cur += count;
239	return res;	250	return res;
240	}	251	}
241		252
242	// get single octet
243	static U8
244	get_u8 (void)
245	{
246	if (cur == end)
247	error ("unexpected end of message buffer");
248
249	return *cur++;
250	}
251
252	// get ber-encoded integer (i.e. pack "w")	253	// get ber-encoded integer (i.e. pack "w")
253	static U32	254	static UV
254	get_w (void)	255	get_w (void)
255	{	256	{
256	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)");
257		262
258	for (;;)	263	for (;;)
259	{	264	{
260	U8 c = get_u8 ();	265	if (expect_false (res >> UVSIZE * 8 - 7))
		266	error ("BER variable length integer overflow");
		267
261	res = (res << 7) \| (c & 0x7f);	268	res = (res << 7) \| (c & 0x7f);
262		269
263	if (!(c & 0x80))	270	if (expect_true (!(c & 0x80)))
264	return res;	271	return res;
265	}
266	}
267		272
		273	c = get_u8 ();
		274	}
		275	}
		276
268	static U32	277	static UV
269	get_length (void)	278	get_length (void)
270	{	279	{
271	U32 res = get_u8 ();	280	UV res = get_u8 ();
272		281
273	if (res & 0x80)	282	if (expect_false (res & 0x80))
274	{	283	{
275	int cnt = res & 0x7f;	284	U8 cnt = res & 0x7f;
		285
		286	// this genewrates quite ugly code, but the overhead
		287	// of copying the bytes for these lengths is probably so high
		288	// that a slightly inefficient get_length won't matter.
		289
		290	if (expect_false (cnt == 0))
		291	error ("indefinite BER value lengths not supported");
		292
		293	if (expect_false (cnt > UVSIZE))
		294	error ("BER value length too long (must fit into UV) or BER reserved value in length (X.690 8.1.3.5)");
		295
		296	want (cnt);
		297
276	res = 0;	298	res = 0;
277		299	do
278	switch (cnt)	300	res = (res << 8) \| *cur++;
279	{	301	while (--cnt);
280	case 0:
281	error ("indefinite ASN.1 lengths not supported");
282	return 0;
283
284	default:
285	error ("ASN.1 length too long");
286	return 0;
287
288	case 4: res = (res << 8) \| get_u8 ();
289	case 3: res = (res << 8) \| get_u8 ();
290	case 2: res = (res << 8) \| get_u8 ();
291	case 1: res = (res << 8) \| get_u8 ();
292	}
293	}	302	}
294		303
295	return res;	304	return res;
296	}	305	}
297		306
298	static SV *	307	static SV *
299	decode_int ()	308	decode_int (void)
300	{	309	{
301	int len = get_length ();	310	UV len = get_length ();
302		311
303	if (len <= 0)	312	if (!len)
304	{	313	error ("invalid BER_TYPE_INT length zero (X.690 8.3.1)");
305	error ("integer length equal to zero");
306	return 0;
307	}
308		314
309	U8 *data = get_n (len);	315	U8 *data = get_n (len);
310		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
311	int negative = data [0] & 0x80;	325	int negative = data [0] & 0x80;
312		326
313	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");
314		331
315	do	332	do
316	val = (val << 8) \| *data++;	333	val = (val << 8) \| *data++;
317	while (--len);	334	while (--len);
318		335
…		…
322	}	339	}
323		340
324	static SV *	341	static SV *
325	decode_data (void)	342	decode_data (void)
326	{	343	{
327	U32 len = get_length ();	344	UV len = get_length ();
328	U8 *data = get_n (len);
329	return newSVpvn ((char *)data, len);	345	return newSVpvn ((char *)get_n (len), len);
330	}	346	}
331		347
332	// gelper for decode_object_identifier	348	// helper for decode_object_identifier
333	static char *	349	static char *
334	write_uv (char *buf, U32 u)	350	write_uv (char *buf, UV u)
335	{	351	{
336	// the one-digit case is absolutely predominant, so this pays off (hopefully)	352	// the one-digit case is absolutely predominant, so this pays off (hopefully)
337	if (expect_true (u < 10))	353	if (expect_true (u < 10))
338	*buf++ = u + '0';	354	*buf++ = u + '0';
339	else	355	else
340	{	356	{
341	// this could be done much faster using branchless fixed-ppint arithmetics	357	// this could be done much faster using branchless fixed-point arithmetics
342	char *beg = buf;	358	char *beg = buf;
343		359
344	do	360	do
345	{	361	{
346	*buf++ = u % 10 + '0';	362	*buf++ = u % 10 + '0';
…		…
363	}	379	}
364		380
365	static SV *	381	static SV *
366	decode_oid (int relative)	382	decode_oid (int relative)
367	{	383	{
368	U32 len = get_length ();	384	UV len = get_length ();
369		385
370	if (len <= 0)	386	if (len <= 0)
371	{	387	{
372	error ("OBJECT IDENTIFIER length equal to zero");	388	error ("BER_TYPE_OID length must not be zero");
373	return &PL_sv_undef;	389	return &PL_sv_undef;
374	}	390	}
375		391
376	U8 *end = cur + len;	392	U8 *end = cur + len;
377	U32 w = get_w ();	393	UV w = get_w ();
378		394
379	static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack	395	static char oid[MAX_OID_STRLEN]; // static, because too large for stack
380	char *app = oid;	396	char *app = oid;
381		397
382	if (relative)	398	if (relative)
383	app = write_uv (app, w);	399	app = write_uv (app, w);
384	else	400	else
385	{	401	{
		402	UV w1, w2;
		403
		404	if (w < 2 * 40)
		405	(w1 = w / 40), (w2 = w % 40);
		406	else
		407	(w1 = 2), (w2 = w - 2 * 40);
		408
386	app = write_uv (app, (U8)w / 40);	409	app = write_uv (app, w1);
387	*app++ = '.';	410	*app++ = '.';
388	app = write_uv (app, (U8)w % 40);	411	app = write_uv (app, w2);
389	}	412	}
390		413
391	while (cur < end)	414	while (cur < end)
392	{	415	{
393	// we assume an oid component is never > 64 digits	416	// we assume an oid component is never > 64 digits
…		…
406	static SV *	429	static SV *
407	decode_ucs (int chrsize)	430	decode_ucs (int chrsize)
408	{	431	{
409	SV *res = NEWSV (0, 0);	432	SV *res = NEWSV (0, 0);
410		433
411	U32 len = get_length ();	434	UV len = get_length ();
412		435
413	if (len & (chrsize - 1))	436	if (len & (chrsize - 1))
414	croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);	437	croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
415		438
416	while (len)	439	while (len)
…		…
437		460
438	return res;	461	return res;
439	}	462	}
440		463
441	static SV *	464	static SV *
442	decode_ber ()	465	decode_ber (void)
443	{	466	{
444	int identifier = get_u8 ();	467	int identifier = get_u8 ();
445		468
446	SV *res;	469	SV *res;
447		470
…		…
450	int tag = identifier & ASN_TAG_MASK;	473	int tag = identifier & ASN_TAG_MASK;
451		474
452	if (tag == ASN_TAG_BER)	475	if (tag == ASN_TAG_BER)
453	tag = get_w ();	476	tag = get_w ();
454		477
455	if (tag == ASN_TAG_BER)
456	tag = get_w ();
457
458	if (constructed)	478	if (constructed)
459	{	479	{
460	U32 len = get_length ();	480	UV len = get_length ();
461	U32 seqend = (cur - buf) + len;	481	UV seqend = (cur - buf) + len;
462	AV av = (AV )sv_2mortal ((SV *)newAV ());	482	AV av = (AV )sv_2mortal ((SV *)newAV ());
463		483
464	while (cur < buf + seqend)	484	while (cur < buf + seqend)
465	av_push (av, decode_ber ());	485	av_push (av, decode_ber ());
466		486
467	if (cur > buf + seqend)	487	if (cur > buf + seqend)
468	croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend);	488	croak ("CONSTRUCTED type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
469		489
470	res = newRV_inc ((SV *)av);	490	res = newRV_inc ((SV *)av);
471	}	491	}
472	else	492	else
473	switch (profile_lookup (cur_profile, klass, tag))	493	switch (profile_lookup (cur_profile, klass, tag))
474	{	494	{
475	case BER_TYPE_NULL:	495	case BER_TYPE_NULL:
476	{	496	{
477	U32 len = get_length ();	497	UV len = get_length ();
478		498
479	if (len)	499	if (len)
480	croak ("BER_TYPE_NULL value with non-zero length %d encountered", len);	500	croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
481		501
482	res = &PL_sv_undef;	502	res = &PL_sv_undef;
483	}	503	}
484	break;	504	break;
485		505
486	case BER_TYPE_BOOL:	506	case BER_TYPE_BOOL:
487	{	507	{
488	U32 len = get_length ();	508	UV len = get_length ();
489		509
490	if (len != 1)	510	if (len != 1)
491	croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len);	511	croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
492		512
493	res = newSVcacheint (!!get_u8 ());	513	res = newSVcacheint (!!get_u8 ());
494	}	514	}
495	break;	515	break;
496		516
…		…
515	res = decode_data ();	535	res = decode_data ();
516	break;	536	break;
517		537
518	case BER_TYPE_IPADDRESS:	538	case BER_TYPE_IPADDRESS:
519	{	539	{
520	U32 len = get_length ();	540	UV len = get_length ();
521		541
522	if (len != 4)	542	if (len != 4)
523	croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len);	543	croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
524		544
525	U8 c1 = get_u8 ();	545	U8 *data = get_n (4);
526	U8 c2 = get_u8 ();	546	res = newSVpvf ("%d.%d.%d.%d", data [0], data [1], data [2], data [3]);
527	U8 c3 = get_u8 ();
528	U8 c4 = get_u8 ();
529
530	res = newSVpvf ("%d.%d.%d.%d", c1, c2, c3, c4);
531	}	547	}
532	break;	548	break;
533		549
534	case BER_TYPE_UCS2:	550	case BER_TYPE_UCS2:
535	res = decode_ucs (2);	551	res = decode_ucs (2);
…		…
538	case BER_TYPE_UCS4:	554	case BER_TYPE_UCS4:
539	res = decode_ucs (4);	555	res = decode_ucs (4);
540	break;	556	break;
541		557
542	case BER_TYPE_REAL:	558	case BER_TYPE_REAL:
		559	error ("BER_TYPE_REAL not implemented");
		560
543	case BER_TYPE_CROAK:	561	case BER_TYPE_CROAK:
		562	croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
		563
544	default:	564	default:
545	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);	565	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
546	}	566	}
547		567
548	AV *av = newAV ();	568	AV *av = newAV ();
549	av_fill (av, BER_ARRAYSIZE - 1);	569	av_fill (av, BER_ARRAYSIZE - 1);
550	AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass);	570	AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
551	AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);	571	AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
552	AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0);	572	AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
553	AvARRAY (av)[BER_DATA ] = res;	573	AvARRAY (av)[BER_DATA ] = res;
554		574
555	return newRV_noinc ((SV *)av);	575	return newRV_noinc ((SV *)av);
556	}	576	}
557		577
558	/////////////////////////////////////////////////////////////////////////////	578	/////////////////////////////////////////////////////////////////////////////
…		…
563	strlen_sum (STRLEN l1, STRLEN l2)	583	strlen_sum (STRLEN l1, STRLEN l2)
564	{	584	{
565	size_t sum = l1 + l2;	585	size_t sum = l1 + l2;
566		586
567	if (sum < (size_t)l2 \|\| sum != (size_t)(STRLEN)sum)	587	if (sum < (size_t)l2 \|\| sum != (size_t)(STRLEN)sum)
568	croak ("JSON::XS: string size overflow");	588	croak ("Convert::BER::XS: string size overflow");
569		589
570	return sum;	590	return sum;
571	}	591	}
572		592
573	static void	593	static void
…		…
611	need (1);	631	need (1);
612	*cur++ = val;	632	*cur++ = val;
613	}	633	}
614		634
615	static void	635	static void
616	put_w_nocheck (U32 val)	636	put_w_nocheck (UV val)
617	{	637	{
		638	#if UVSIZE > 4
		639	cur = (val >> 7 9) \| 0x80; cur += val >= ((UV)1 << (7 * 9));
		640	cur = (val >> 7 8) \| 0x80; cur += val >= ((UV)1 << (7 * 8));
		641	cur = (val >> 7 7) \| 0x80; cur += val >= ((UV)1 << (7 * 7));
		642	cur = (val >> 7 6) \| 0x80; cur += val >= ((UV)1 << (7 * 6));
		643	cur = (val >> 7 5) \| 0x80; cur += val >= ((UV)1 << (7 * 5));
		644	#endif
618	cur = (val >> 7 4) \| 0x80; cur += val >= (1 << (7 * 4));	645	cur = (val >> 7 4) \| 0x80; cur += val >= ((UV)1 << (7 * 4));
619	cur = (val >> 7 3) \| 0x80; cur += val >= (1 << (7 * 3));	646	cur = (val >> 7 3) \| 0x80; cur += val >= ((UV)1 << (7 * 3));
620	cur = (val >> 7 2) \| 0x80; cur += val >= (1 << (7 * 2));	647	cur = (val >> 7 2) \| 0x80; cur += val >= ((UV)1 << (7 * 2));
621	cur = (val >> 7 1) \| 0x80; cur += val >= (1 << (7 * 1));	648	cur = (val >> 7 1) \| 0x80; cur += val >= ((UV)1 << (7 * 1));
622	*cur = val & 0x7f; cur += 1;	649	*cur = val & 0x7f; cur += 1;
623	}	650	}
624		651
625	static void	652	static void
626	put_w (U32 val)	653	put_w (UV val)
627	{	654	{
628	need (5); // we only handle up to 5 bytes	655	need (5); // we only handle up to 5 bytes
629		656
630	put_w_nocheck (val);	657	put_w_nocheck (val);
631	}	658	}
632		659
633	static U8 *	660	static U8 *
634	put_length_at (U32 val, U8 *cur)	661	put_length_at (UV val, U8 *cur)
635	{	662	{
636	if (val < 0x7fU)	663	if (val <= 0x7fU)
637	*cur++ = val;	664	*cur++ = val;
638	else	665	else
639	{	666	{
640	U8 *lenb = cur++;	667	U8 *lenb = cur++;
641		668
642	cur = val >> 24; cur += cur > 0;	669	#if UVSIZE > 4
643	cur = val >> 16; cur += cur > 0;	670	cur = val >> 56; cur += val >= ((UV)1 << (8 7));
644	cur = val >> 8; cur += cur > 0;	671	cur = val >> 48; cur += val >= ((UV)1 << (8 6));
		672	cur = val >> 40; cur += val >= ((UV)1 << (8 5));
		673	cur = val >> 32; cur += val >= ((UV)1 << (8 4));
		674	#endif
		675	cur = val >> 24; cur += val >= ((UV)1 << (8 3));
		676	cur = val >> 16; cur += val >= ((UV)1 << (8 2));
		677	cur = val >> 8; cur += val >= ((UV)1 << (8 1));
645	*cur = val ; cur += 1;	678	*cur = val ; cur += 1;
646		679
647	*lenb = 0x80 + cur - lenb - 1;	680	*lenb = 0x80 + cur - lenb - 1;
648	}	681	}
649		682
650	return cur;	683	return cur;
651	}	684	}
652		685
653	static void	686	static void
654	put_length (U32 val)	687	put_length (UV val)
655	{	688	{
656	need (5 + val);	689	need (9 + val);
657	cur = put_length_at (val, cur);	690	cur = put_length_at (val, cur);
658	}	691	}
659		692
660	// return how many bytes the encoded length requires	693	// return how many bytes the encoded length requires
661	static int length_length (U32 val)	694	static int length_length (UV val)
662	{	695	{
663	return val < 0x7fU	696	// use hashing with a DeBruin sequence, anyone?
		697	return expect_true (val <= 0x7fU)
664	? 1	698	? 1
665	: 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU);	699	: 2
		700	+ (val > 0x000000000000ffU)
		701	+ (val > 0x0000000000ffffU)
		702	+ (val > 0x00000000ffffffU)
		703	#if UVSIZE > 4
		704	+ (val > 0x000000ffffffffU)
		705	+ (val > 0x0000ffffffffffU)
		706	+ (val > 0x00ffffffffffffU)
		707	+ (val > 0xffffffffffffffU)
		708	#endif
		709	;
666	}	710	}
667		711
668	static void	712	static void
669	encode_data (const char *ptr, STRLEN len)	713	encode_data (const char *ptr, STRLEN len)
670	{	714	{
…		…
732		776
733	*lenb = cur - lenb - 1;	777	*lenb = cur - lenb - 1;
734	}	778	}
735		779
736	// we don't know the length yet, so we optimistically	780	// we don't know the length yet, so we optimistically
737	// assume the length will need one octet later. if that	781	// assume the length will need one octet later. If that
738	// turns out to be wrong, we memove as needed.	782	// turns out to be wrong, we memmove as needed.
739	// mark the beginning	783	// mark the beginning
740	static STRLEN	784	static STRLEN
741	len_fixup_mark ()	785	len_fixup_mark (void)
742	{	786	{
743	return cur++ - buf;	787	return cur++ - buf;
744	}	788	}
745		789
746	// patch up the length	790	// patch up the length
…		…
855	{	899	{
856	AV *av = ber_tuple (tuple);	900	AV *av = ber_tuple (tuple);
857		901
858	int klass = SvIV (AvARRAY (av)[BER_CLASS]);	902	int klass = SvIV (AvARRAY (av)[BER_CLASS]);
859	int tag = SvIV (AvARRAY (av)[BER_TAG]);	903	int tag = SvIV (AvARRAY (av)[BER_TAG]);
860	int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0;	904	int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
861	SV *data = AvARRAY (av)[BER_DATA];	905	SV *data = AvARRAY (av)[BER_DATA];
862		906
863	int identifier = (klass << ASN_CLASS_SHIFT) \| constructed;	907	int identifier = (klass << ASN_CLASS_SHIFT) \| constructed;
864		908
865	if (expect_false (tag >= ASN_TAG_BER))	909	if (expect_false (tag >= ASN_TAG_BER))
…		…
876	// and adjust later	920	// and adjust later
877	need (1);	921	need (1);
878	STRLEN mark = len_fixup_mark ();	922	STRLEN mark = len_fixup_mark ();
879		923
880	if (expect_false (!SvROK (data) \|\| SvTYPE (SvRV (data)) != SVt_PVAV))	924	if (expect_false (!SvROK (data) \|\| SvTYPE (SvRV (data)) != SVt_PVAV))
881	croak ("BER constructed data must be array-reference");	925	croak ("BER CONSTRUCTED data must be array-reference");
882		926
883	AV av = (AV )SvRV (data);	927	AV av = (AV )SvRV (data);
884	int fill = AvFILL (av);	928	int fill = AvFILL (av);
885		929
886	if (expect_false (SvRMAGICAL (av)))	930	if (expect_false (SvRMAGICAL (av)))
887	croak ("BER constructed data must not be tied");	931	croak ("BER CONSTRUCTED data must not be tied");
888		932
889	int i;	933	int i;
890	for (i = 0; i <= fill; ++i)	934	for (i = 0; i <= fill; ++i)
891	encode_ber (AvARRAY (av)[i]);	935	encode_ber (AvARRAY (av)[i]);
892		936
…		…
899	put_length (0);	943	put_length (0);
900	break;	944	break;
901		945
902	case BER_TYPE_BOOL:	946	case BER_TYPE_BOOL:
903	put_length (1);	947	put_length (1);
904	*cur++ = SvTRUE (data) ? 0xff : 0x00;	948	*cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
905	break;	949	break;
906		950
907	case BER_TYPE_OID:	951	case BER_TYPE_OID:
908	encode_oid (data, 0);	952	encode_oid (data, 0);
909	break;	953	break;
…		…
947	case BER_TYPE_UCS4:	991	case BER_TYPE_UCS4:
948	encode_ucs (data, 4);	992	encode_ucs (data, 4);
949	break;	993	break;
950		994
951	case BER_TYPE_REAL:	995	case BER_TYPE_REAL:
		996	croak ("BER_TYPE_REAL not implemented");
		997
952	case BER_TYPE_CROAK:	998	case BER_TYPE_CROAK:
		999	croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
		1000
953	default:	1001	default:
954	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);	1002	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
955	}	1003	}
956		1004
957	}	1005	}
…		…
972	const char *name;	1020	const char *name;
973	IV iv;	1021	IV iv;
974	} *civ, const_iv[] = {	1022	} *civ, const_iv[] = {
975	#define const_iv(name) { # name, name },	1023	#define const_iv(name) { # name, name },
976	const_iv (ASN_BOOLEAN)	1024	const_iv (ASN_BOOLEAN)
977	const_iv (ASN_INTEGER32)	1025	const_iv (ASN_INTEGER)
978	const_iv (ASN_BIT_STRING)	1026	const_iv (ASN_BIT_STRING)
979	const_iv (ASN_OCTET_STRING)	1027	const_iv (ASN_OCTET_STRING)
980	const_iv (ASN_NULL)	1028	const_iv (ASN_NULL)
981	const_iv (ASN_OBJECT_IDENTIFIER)	1029	const_iv (ASN_OBJECT_IDENTIFIER)
982	const_iv (ASN_OBJECT_DESCRIPTOR)	1030	const_iv (ASN_OBJECT_DESCRIPTOR)
…		…
1011	const_iv (ASN_CONTEXT)	1059	const_iv (ASN_CONTEXT)
1012	const_iv (ASN_PRIVATE)	1060	const_iv (ASN_PRIVATE)
1013		1061
1014	const_iv (BER_CLASS)	1062	const_iv (BER_CLASS)
1015	const_iv (BER_TAG)	1063	const_iv (BER_TAG)
1016	const_iv (BER_CONSTRUCTED)	1064	const_iv (BER_FLAGS)
1017	const_iv (BER_DATA)	1065	const_iv (BER_DATA)
1018		1066
1019	const_iv (BER_TYPE_BYTES)	1067	const_iv (BER_TYPE_BYTES)
1020	const_iv (BER_TYPE_UTF8)	1068	const_iv (BER_TYPE_UTF8)
1021	const_iv (BER_TYPE_UCS2)	1069	const_iv (BER_TYPE_UCS2)
…		…
1029	const_iv (BER_TYPE_IPADDRESS)	1077	const_iv (BER_TYPE_IPADDRESS)
1030	const_iv (BER_TYPE_CROAK)	1078	const_iv (BER_TYPE_CROAK)
1031		1079
1032	const_iv (SNMP_IPADDRESS)	1080	const_iv (SNMP_IPADDRESS)
1033	const_iv (SNMP_COUNTER32)	1081	const_iv (SNMP_COUNTER32)
		1082	const_iv (SNMP_GAUGE32)
1034	const_iv (SNMP_UNSIGNED32)	1083	const_iv (SNMP_UNSIGNED32)
1035	const_iv (SNMP_TIMETICKS)	1084	const_iv (SNMP_TIMETICKS)
1036	const_iv (SNMP_OPAQUE)	1085	const_iv (SNMP_OPAQUE)
1037	const_iv (SNMP_COUNTER64)	1086	const_iv (SNMP_COUNTER64)
1038	};	1087	};
1039		1088
1040	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)	1089	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
1041	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	1090	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1042	}	1091	}
1043		1092
1044	SV *	1093	void
1045	ber_decode (SV ber, SV profile = &PL_sv_undef)	1094	ber_decode (SV ber, SV profile = &PL_sv_undef)
		1095	ALIAS:
		1096	ber_decode_prefix = 1
1046	CODE:	1097	PPCODE:
1047	{	1098	{
1048	cur_profile = SvPROFILE (profile);	1099	cur_profile = SvPROFILE (profile);
1049	STRLEN len;	1100	STRLEN len;
1050	buf = (U8 *)SvPVbyte (ber, len);	1101	buf = (U8 *)SvPVbyte (ber, len);
1051	cur = buf;	1102	cur = buf;
1052	end = buf + len;	1103	end = buf + len;
1053		1104
1054	RETVAL = decode_ber ();	1105	SV *tuple = decode_ber ();
		1106
		1107	EXTEND (SP, 2);
		1108	PUSHs (sv_2mortal (tuple));
		1109
		1110	if (ix)
		1111	PUSHs (sv_2mortal (newSViv (cur - buf)));
		1112	else if (cur != end)
		1113	error ("trailing garbage after BER value");
1055	}	1114	}
1056	OUTPUT: RETVAL
1057		1115
1058	void	1116	void
1059	ber_is (SV tuple, SV klass = &PL_sv_undef, SV tag = &PL_sv_undef, SV constructed = &PL_sv_undef, SV *data = &PL_sv_undef)	1117	ber_is (SV tuple, SV klass = &PL_sv_undef, SV tag = &PL_sv_undef, SV flags = &PL_sv_undef, SV *data = &PL_sv_undef)
1060	PPCODE:	1118	PPCODE:
1061	{	1119	{
1062	if (!SvOK (tuple))	1120	if (!SvOK (tuple))
1063	XSRETURN_NO;	1121	XSRETURN_NO;
1064		1122
…		…
1066	croak ("ber_is: tuple must be BER tuple (array-ref)");	1124	croak ("ber_is: tuple must be BER tuple (array-ref)");
1067		1125
1068	AV av = (AV )SvRV (tuple);	1126	AV av = (AV )SvRV (tuple);
1069		1127
1070	XPUSHs (	1128	XPUSHs (
1071	(!SvOK (klass) \|\| SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass))	1129	(!SvOK (klass) \|\| SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1072	&& (!SvOK (tag) \|\| SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))	1130	&& (!SvOK (tag) \|\| SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1073	&& (!SvOK (constructed) \|\| !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed))	1131	&& (!SvOK (flags) \|\| !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1074	&& (!SvOK (data) \|\| sv_eq (AvARRAY (av)[BER_DATA ], data))	1132	&& (!SvOK (data) \|\| sv_eq (AvARRAY (av)[BER_DATA ], data))
1075	? &PL_sv_yes : &PL_sv_undef);	1133	? &PL_sv_yes : &PL_sv_undef);
1076	}	1134	}
1077		1135
1078	void	1136	void
1079	ber_is_seq (SV *tuple)	1137	ber_is_seq (SV *tuple)
…		…
1083	XSRETURN_UNDEF;	1141	XSRETURN_UNDEF;
1084		1142
1085	AV *av = ber_tuple (tuple);	1143	AV *av = ber_tuple (tuple);
1086		1144
1087	XPUSHs (	1145	XPUSHs (
1088	SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL	1146	SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1089	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE	1147	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1090	&& SvIV (AvARRAY (av)[BER_CONSTRUCTED])	1148	&& SvIV (AvARRAY (av)[BER_FLAGS])
1091	? AvARRAY (av)[BER_DATA] : &PL_sv_undef);	1149	? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1092	}	1150	}
1093		1151
1094	void	1152	void
1095	ber_is_i32 (SV tuple, SV value = &PL_sv_undef)	1153	ber_is_int (SV tuple, SV value = &PL_sv_undef)
1096	PPCODE:	1154	PPCODE:
1097	{	1155	{
1098	if (!SvOK (tuple))	1156	if (!SvOK (tuple))
1099	XSRETURN_NO;	1157	XSRETURN_NO;
1100		1158
1101	AV *av = ber_tuple (tuple);	1159	AV *av = ber_tuple (tuple);
1102		1160
1103	IV data = SvIV (AvARRAY (av)[BER_DATA]);	1161	UV data = SvUV (AvARRAY (av)[BER_DATA]);
1104		1162
1105	XPUSHs (	1163	XPUSHs (
1106	SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL	1164	SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1107	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32	1165	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1108	&& !SvIV (AvARRAY (av)[BER_CONSTRUCTED])	1166	&& !SvIV (AvARRAY (av)[BER_FLAGS])
1109	&& (!SvOK (value) \|\| data == SvIV (value))	1167	&& (!SvOK (value) \|\| data == SvUV (value))
1110	? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0))	1168	? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1111	: &PL_sv_undef);	1169	: &PL_sv_undef);
1112	}	1170	}
1113		1171
1114	void	1172	void
1115	ber_is_oid (SV tuple, SV oid = &PL_sv_undef)	1173	ber_is_oid (SV tuple, SV oid = &PL_sv_undef)
…		…
1119	XSRETURN_NO;	1177	XSRETURN_NO;
1120		1178
1121	AV *av = ber_tuple (tuple);	1179	AV *av = ber_tuple (tuple);
1122		1180
1123	XPUSHs (	1181	XPUSHs (
1124	SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL	1182	SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1125	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER	1183	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1126	&& !SvIV (AvARRAY (av)[BER_CONSTRUCTED])	1184	&& !SvIV (AvARRAY (av)[BER_FLAGS])
1127	&& (!SvOK (oid) \|\| sv_eq (AvARRAY (av)[BER_DATA], oid))	1185	&& (!SvOK (oid) \|\| sv_eq (AvARRAY (av)[BER_DATA], oid))
1128	? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);	1186	? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1129	}	1187	}
1130		1188
1131	#############################################################################	1189	#############################################################################
…		…
1144	SvCUR_set (buf_sv, cur - buf);	1202	SvCUR_set (buf_sv, cur - buf);
1145	XPUSHs (buf_sv);	1203	XPUSHs (buf_sv);
1146	}	1204	}
1147		1205
1148	SV *	1206	SV *
1149	ber_i32 (IV iv)	1207	ber_int (SV *sv)
1150	CODE:	1208	CODE:
1151	{	1209	{
1152	AV *av = newAV ();	1210	AV *av = newAV ();
1153	av_fill (av, BER_ARRAYSIZE - 1);	1211	av_fill (av, BER_ARRAYSIZE - 1);
1154	AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL);	1212	AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1155	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32);	1213	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1156	AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0);	1214	AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1157	AvARRAY (av)[BER_DATA ] = newSViv (iv);	1215	AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1158	RETVAL = newRV_noinc ((SV *)av);	1216	RETVAL = newRV_noinc ((SV *)av);
1159	}	1217	}
1160	OUTPUT: RETVAL	1218	OUTPUT: RETVAL
1161		1219
1162	# TODO: not arrayref, but elements?	1220	# TODO: not arrayref, but elements?
…		…
1164	ber_seq (SV *arrayref)	1222	ber_seq (SV *arrayref)
1165	CODE:	1223	CODE:
1166	{	1224	{
1167	AV *av = newAV ();	1225	AV *av = newAV ();
1168	av_fill (av, BER_ARRAYSIZE - 1);	1226	av_fill (av, BER_ARRAYSIZE - 1);
1169	AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL);	1227	AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1170	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);	1228	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1171	AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1);	1229	AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1172	AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);	1230	AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1173	RETVAL = newRV_noinc ((SV *)av);	1231	RETVAL = newRV_noinc ((SV *)av);
1174	}	1232	}
1175	OUTPUT: RETVAL	1233	OUTPUT: RETVAL
1176		1234
1177	MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile	1235	MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile

Diff Legend

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

Comparing Convert-BER-XS/XS.xs (file contents): Revision 1.13 by root, Sat Apr 20 13:46:14 2019 UTC vs. Revision 1.29 by root, Tue Apr 23 19:44:12 2019 UTC

Diff Legend

Comparing Convert-BER-XS/XS.xs (file contents):
Revision 1.13 by root, Sat Apr 20 13:46:14 2019 UTC vs.
Revision 1.29 by root, Tue Apr 23 19:44:12 2019 UTC