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

Comparing Convert-BER-XS/XS.xs (file contents):
Revision 1.14 by root, Sat Apr 20 14:09:56 2019 UTC vs.
Revision 1.30 by root, Tue Apr 23 20:03:08 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	};
68		69
		70	// tlow-level types this module can ecode the above (and more) into
69	enum {	71	enum {
70	BER_TYPE_BYTES,	72	BER_TYPE_BYTES,
71	BER_TYPE_UTF8,	73	BER_TYPE_UTF8,
72	BER_TYPE_UCS2,	74	BER_TYPE_UCS2,
73	BER_TYPE_UCS4,	75	BER_TYPE_UCS4,
…		…
79	BER_TYPE_REAL,	81	BER_TYPE_REAL,
80	BER_TYPE_IPADDRESS,	82	BER_TYPE_IPADDRESS,
81	BER_TYPE_CROAK,	83	BER_TYPE_CROAK,
82	};	84	};
83		85
		86	// tuple array indices
84	enum {	87	enum {
85	BER_CLASS = 0,	88	BER_CLASS = 0,
86	BER_TAG = 1,	89	BER_TAG = 1,
87	BER_CONSTRUCTED = 2,	90	BER_FLAGS = 2,
88	BER_DATA = 3,	91	BER_DATA = 3,
89	BER_ARRAYSIZE	92	BER_ARRAYSIZE
90	};	93	};
91		94
92	#define MAX_OID_STRLEN 4096	95	#define MAX_OID_STRLEN 4096
93		96
…		…
140	{	143	{
141	if (!SvOK (profile))	144	if (!SvOK (profile))
142	return default_profile;	145	return default_profile;
143		146
144	if (!SvROK (profile))	147	if (!SvROK (profile))
145	croak ("invalid profile");	148	croak ("Convert::BER::XS::Profile expected");
146		149
147	profile = SvRV (profile);	150	profile = SvRV (profile);
148		151
149	if (SvSTASH (profile) != profile_stash)	152	if (SvSTASH (profile) != profile_stash)
150	croak ("invalid profile object");	153	croak ("Convert::BER::XS::Profile expected");
151		154
152	return (void *)profile;	155	return (void *)profile;
153	}	156	}
154		157
155	static int	158	static int
…		…
191	int klass;	194	int klass;
192	int tag;	195	int tag;
193	int type;	196	int type;
194	} *celem, default_map[] = {	197	} *celem, default_map[] = {
195	{ ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },	198	{ ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
196	{ ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT },	199	{ ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
197	{ ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },	200	{ ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
198	{ ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },	201	{ ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },
199	{ ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },	202	{ ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
200	{ ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },	203	{ ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
201	{ ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },	204	{ ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
…		…
227	}	230	}
228		231
229	// get_* functions fetch something from the buffer	232	// get_* functions fetch something from the buffer
230	// decode_* functions use get_* fun ctions to decode ber values	233	// decode_* functions use get_* fun ctions to decode ber values
231		234
		235	// get single octet
		236	static U8
		237	get_u8 (void)
		238	{
		239	if (cur == end)
		240	error ("unexpected end of message buffer");
		241
		242	return *cur++;
		243	}
		244
232	// get n octets	245	// get n octets
233	static U8 *	246	static U8 *
234	get_n (UV count)	247	get_n (UV count)
235	{	248	{
236	want (count);	249	want (count);
237	U8 *res = cur;	250	U8 *res = cur;
238	cur += count;	251	cur += count;
239	return res;	252	return res;
240	}	253	}
241		254
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")	255	// get ber-encoded integer (i.e. pack "w")
253	static U32	256	static UV
254	get_w (void)	257	get_w (void)
255	{	258	{
256	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)");
257		264
258	for (;;)	265	for (;;)
259	{	266	{
260	U8 c = get_u8 ();	267	if (expect_false (res >> UVSIZE * 8 - 7))
		268	error ("BER variable length integer overflow");
		269
261	res = (res << 7) \| (c & 0x7f);	270	res = (res << 7) \| (c & 0x7f);
262		271
263	if (!(c & 0x80))	272	if (expect_true (!(c & 0x80)))
264	return res;	273	return res;
265	}
266	}
267		274
		275	c = get_u8 ();
		276	}
		277	}
		278
268	static U32	279	static UV
269	get_length (void)	280	get_length (void)
270	{	281	{
271	U32 res = get_u8 ();	282	UV res = get_u8 ();
272		283
273	if (res & 0x80)	284	if (expect_false (res & 0x80))
274	{	285	{
275	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
276	res = 0;	300	res = 0;
277		301	do
278	switch (cnt)	302	res = (res << 8) \| *cur++;
279	{	303	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	}	304	}
294		305
295	return res;	306	return res;
296	}	307	}
297		308
298	static SV *	309	static SV *
299	decode_int (void)	310	decode_int (UV len)
300	{	311	{
301	int len = get_length ();
302
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
…		…
320	// but that's ok, as perl relies on it as well.	337	// but that's ok, as perl relies on it as well.
321	return negative ? newSViv ((IV)val) : newSVuv (val);	338	return negative ? newSViv ((IV)val) : newSVuv (val);
322	}	339	}
323		340
324	static SV *	341	static SV *
325	decode_data (void)	342	decode_data (UV len)
326	{	343	{
327	U32 len = get_length ();
328	U8 *data = get_n (len);
329	return newSVpvn ((char *)data, len);	344	return newSVpvn ((char *)get_n (len), len);
330	}	345	}
331		346
332	// gelper for decode_object_identifier	347	// helper for decode_object_identifier
333	static char *	348	static char *
334	write_uv (char *buf, U32 u)	349	write_uv (char *buf, UV u)
335	{	350	{
336	// 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)
337	if (expect_true (u < 10))	352	if (expect_true (u < 10))
338	*buf++ = u + '0';	353	*buf++ = u + '0';
339	else	354	else
340	{	355	{
341	// this could be done much faster using branchless fixed-ppint arithmetics	356	// this could be done much faster using branchless fixed-point arithmetics
342	char *beg = buf;	357	char *beg = buf;
343		358
344	do	359	do
345	{	360	{
346	*buf++ = u % 10 + '0';	361	*buf++ = u % 10 + '0';
…		…
361		376
362	return buf;	377	return buf;
363	}	378	}
364		379
365	static SV *	380	static SV *
366	decode_oid (int relative)	381	decode_oid (UV len, int relative)
367	{	382	{
368	U32 len = get_length ();
369
370	if (len <= 0)	383	if (len <= 0)
371	{	384	{
372	error ("OBJECT IDENTIFIER length equal to zero");	385	error ("BER_TYPE_OID length must not be zero");
373	return &PL_sv_undef;	386	return &PL_sv_undef;
374	}	387	}
375		388
376	U8 *end = cur + len;	389	U8 *end = cur + len;
377	U32 w = get_w ();	390	UV w = get_w ();
378		391
379	static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack	392	static char oid[MAX_OID_STRLEN]; // static, because too large for stack
380	char *app = oid;	393	char *app = oid;
381		394
382	if (relative)	395	if (relative)
383	app = write_uv (app, w);	396	app = write_uv (app, w);
384	else	397	else
385	{	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
386	app = write_uv (app, (U8)w / 40);	406	app = write_uv (app, w1);
387	*app++ = '.';	407	*app++ = '.';
388	app = write_uv (app, (U8)w % 40);	408	app = write_uv (app, w2);
389	}	409	}
390		410
391	while (cur < end)	411	while (cur < end)
392	{	412	{
393	// we assume an oid component is never > 64 digits	413	// we assume an oid component is never > 64 digits
…		…
402	return newSVpvn (oid, app - oid);	422	return newSVpvn (oid, app - oid);
403	}	423	}
404		424
405	// TODO: this is unacceptably slow	425	// TODO: this is unacceptably slow
406	static SV *	426	static SV *
407	decode_ucs (int chrsize)	427	decode_ucs (UV len, int chrsize)
408	{	428	{
409	SV *res = NEWSV (0, 0);
410
411	U32 len = get_length ();
412
413	if (len & (chrsize - 1))	429	if (len & (chrsize - 1))
414	croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);	430	croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
		431
		432	SV *res = NEWSV (0, 0);
415		433
416	while (len)	434	while (len)
417	{	435	{
418	U8 b1 = get_u8 ();	436	U8 b1 = get_u8 ();
419	U8 b2 = get_u8 ();	437	U8 b2 = get_u8 ();
…		…
450	int tag = identifier & ASN_TAG_MASK;	468	int tag = identifier & ASN_TAG_MASK;
451		469
452	if (tag == ASN_TAG_BER)	470	if (tag == ASN_TAG_BER)
453	tag = get_w ();	471	tag = get_w ();
454		472
455	if (tag == ASN_TAG_BER)
456	tag = get_w ();
457
458	if (constructed)	473	if (constructed)
459	{	474	{
460	U32 len = get_length ();	475	UV len = get_length ();
461	U32 seqend = (cur - buf) + len;	476	UV seqend = (cur - buf) + len;
462	AV av = (AV )sv_2mortal ((SV *)newAV ());	477	AV av = (AV )sv_2mortal ((SV *)newAV ());
463		478
464	while (cur < buf + seqend)	479	while (cur < buf + seqend)
465	av_push (av, decode_ber ());	480	av_push (av, decode_ber ());
466		481
467	if (cur > buf + seqend)	482	if (expect_false (cur > buf + seqend))
468	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);
469		484
470	res = newRV_inc ((SV *)av);	485	res = newRV_inc ((SV *)av);
471	}	486	}
472	else	487	else
		488	{
		489	UV len = get_length ();
		490
473	switch (profile_lookup (cur_profile, klass, tag))	491	switch (profile_lookup (cur_profile, klass, tag))
474	{	492	{
475	case BER_TYPE_NULL:	493	case BER_TYPE_NULL:
476	{	494	if (expect_false (len))
477	U32 len = get_length ();
478
479	if (len)
480	croak ("BER_TYPE_NULL value with non-zero length %d encountered", len);	495	croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
481		496
482	res = &PL_sv_undef;	497	res = &PL_sv_undef;
483	}
484	break;	498	break;
485		499
486	case BER_TYPE_BOOL:	500	case BER_TYPE_BOOL:
487	{
488	U32 len = get_length ();
489
490	if (len != 1)	501	if (expect_false (len != 1))
491	croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered", len);	502	croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
492		503
493	res = newSVcacheint (!!get_u8 ());	504	res = newSVcacheint (!!get_u8 ());
494	}
495	break;	505	break;
496		506
497	case BER_TYPE_OID:	507	case BER_TYPE_OID:
498	res = decode_oid (0);	508	res = decode_oid (len, 0);
499	break;	509	break;
500		510
501	case BER_TYPE_RELOID:	511	case BER_TYPE_RELOID:
502	res = decode_oid (1);	512	res = decode_oid (len, 1);
503	break;	513	break;
504		514
505	case BER_TYPE_INT:	515	case BER_TYPE_INT:
506	res = decode_int ();	516	res = decode_int (len);
507	break;	517	break;
508		518
509	case BER_TYPE_UTF8:	519	case BER_TYPE_UTF8:
510	res = decode_data ();	520	res = decode_data (len);
511	SvUTF8_on (res);	521	SvUTF8_on (res);
512	break;	522	break;
513		523
514	case BER_TYPE_BYTES:	524	case BER_TYPE_BYTES:
515	res = decode_data ();	525	res = decode_data (len);
516	break;	526	break;
517		527
518	case BER_TYPE_IPADDRESS:	528	case BER_TYPE_IPADDRESS:
519	{	529	{
520	U32 len = get_length ();
521
522	if (len != 4)	530	if (len != 4)
523	croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len);	531	croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
524		532
525	U8 c1 = get_u8 ();	533	U8 *data = get_n (4);
526	U8 c2 = get_u8 ();	534	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	}	535	}
532	break;	536	break;
533		537
534	case BER_TYPE_UCS2:	538	case BER_TYPE_UCS2:
535	res = decode_ucs (2);	539	res = decode_ucs (len, 2);
536	break;	540	break;
537		541
538	case BER_TYPE_UCS4:	542	case BER_TYPE_UCS4:
539	res = decode_ucs (4);	543	res = decode_ucs (len, 4);
540	break;	544	break;
541		545
542	case BER_TYPE_REAL:	546	case BER_TYPE_REAL:
		547	error ("BER_TYPE_REAL not implemented");
		548
543	case BER_TYPE_CROAK:	549	case BER_TYPE_CROAK:
		550	croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
		551
544	default:	552	default:
545	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);	553	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
546	}	554	}
		555	}
547		556
548	AV *av = newAV ();	557	AV *av = newAV ();
549	av_fill (av, BER_ARRAYSIZE - 1);	558	av_fill (av, BER_ARRAYSIZE - 1);
550	AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass);	559	AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
551	AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);	560	AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
552	AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0);	561	AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
553	AvARRAY (av)[BER_DATA ] = res;	562	AvARRAY (av)[BER_DATA ] = res;
554		563
555	return newRV_noinc ((SV *)av);	564	return newRV_noinc ((SV *)av);
556	}	565	}
557		566
558	/////////////////////////////////////////////////////////////////////////////	567	/////////////////////////////////////////////////////////////////////////////
…		…
563	strlen_sum (STRLEN l1, STRLEN l2)	572	strlen_sum (STRLEN l1, STRLEN l2)
564	{	573	{
565	size_t sum = l1 + l2;	574	size_t sum = l1 + l2;
566		575
567	if (sum < (size_t)l2 \|\| sum != (size_t)(STRLEN)sum)	576	if (sum < (size_t)l2 \|\| sum != (size_t)(STRLEN)sum)
568	croak ("JSON::XS: string size overflow");	577	croak ("Convert::BER::XS: string size overflow");
569		578
570	return sum;	579	return sum;
571	}	580	}
572		581
573	static void	582	static void
…		…
611	need (1);	620	need (1);
612	*cur++ = val;	621	*cur++ = val;
613	}	622	}
614		623
615	static void	624	static void
616	put_w_nocheck (U32 val)	625	put_w_nocheck (UV val)
617	{	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
618	cur = (val >> 7 4) \| 0x80; cur += val >= (1 << (7 * 4));	634	cur = (val >> 7 4) \| 0x80; cur += val >= ((UV)1 << (7 * 4));
619	cur = (val >> 7 3) \| 0x80; cur += val >= (1 << (7 * 3));	635	cur = (val >> 7 3) \| 0x80; cur += val >= ((UV)1 << (7 * 3));
620	cur = (val >> 7 2) \| 0x80; cur += val >= (1 << (7 * 2));	636	cur = (val >> 7 2) \| 0x80; cur += val >= ((UV)1 << (7 * 2));
621	cur = (val >> 7 1) \| 0x80; cur += val >= (1 << (7 * 1));	637	cur = (val >> 7 1) \| 0x80; cur += val >= ((UV)1 << (7 * 1));
622	*cur = val & 0x7f; cur += 1;	638	*cur = val & 0x7f; cur += 1;
623	}	639	}
624		640
625	static void	641	static void
626	put_w (U32 val)	642	put_w (UV val)
627	{	643	{
628	need (5); // we only handle up to 5 bytes	644	need (5); // we only handle up to 5 bytes
629		645
630	put_w_nocheck (val);	646	put_w_nocheck (val);
631	}	647	}
632		648
633	static U8 *	649	static U8 *
634	put_length_at (U32 val, U8 *cur)	650	put_length_at (UV val, U8 *cur)
635	{	651	{
636	if (val < 0x7fU)	652	if (val <= 0x7fU)
637	*cur++ = val;	653	*cur++ = val;
638	else	654	else
639	{	655	{
640	U8 *lenb = cur++;	656	U8 *lenb = cur++;
641		657
642	cur = val >> 24; cur += cur > 0;	658	#if UVSIZE > 4
643	cur = val >> 16; cur += cur > 0;	659	cur = val >> 56; cur += val >= ((UV)1 << (8 7));
644	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));
645	*cur = val ; cur += 1;	667	*cur = val ; cur += 1;
646		668
647	*lenb = 0x80 + cur - lenb - 1;	669	*lenb = 0x80 + cur - lenb - 1;
648	}	670	}
649		671
650	return cur;	672	return cur;
651	}	673	}
652		674
653	static void	675	static void
654	put_length (U32 val)	676	put_length (UV val)
655	{	677	{
656	need (5 + val);	678	need (9 + val);
657	cur = put_length_at (val, cur);	679	cur = put_length_at (val, cur);
658	}	680	}
659		681
660	// return how many bytes the encoded length requires	682	// return how many bytes the encoded length requires
661	static int length_length (U32 val)	683	static int length_length (UV val)
662	{	684	{
663	return val < 0x7fU	685	// use hashing with a DeBruin sequence, anyone?
		686	return expect_true (val <= 0x7fU)
664	? 1	687	? 1
665	: 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	;
666	}	699	}
667		700
668	static void	701	static void
669	encode_data (const char *ptr, STRLEN len)	702	encode_data (const char *ptr, STRLEN len)
670	{	703	{
…		…
732		765
733	*lenb = cur - lenb - 1;	766	*lenb = cur - lenb - 1;
734	}	767	}
735		768
736	// we don't know the length yet, so we optimistically	769	// we don't know the length yet, so we optimistically
737	// assume the length will need one octet later. if that	770	// assume the length will need one octet later. If that
738	// turns out to be wrong, we memove as needed.	771	// turns out to be wrong, we memmove as needed.
739	// mark the beginning	772	// mark the beginning
740	static STRLEN	773	static STRLEN
741	len_fixup_mark (void)	774	len_fixup_mark (void)
742	{	775	{
743	return cur++ - buf;	776	return cur++ - buf;
…		…
855	{	888	{
856	AV *av = ber_tuple (tuple);	889	AV *av = ber_tuple (tuple);
857		890
858	int klass = SvIV (AvARRAY (av)[BER_CLASS]);	891	int klass = SvIV (AvARRAY (av)[BER_CLASS]);
859	int tag = SvIV (AvARRAY (av)[BER_TAG]);	892	int tag = SvIV (AvARRAY (av)[BER_TAG]);
860	int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0;	893	int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
861	SV *data = AvARRAY (av)[BER_DATA];	894	SV *data = AvARRAY (av)[BER_DATA];
862		895
863	int identifier = (klass << ASN_CLASS_SHIFT) \| constructed;	896	int identifier = (klass << ASN_CLASS_SHIFT) \| constructed;
864		897
865	if (expect_false (tag >= ASN_TAG_BER))	898	if (expect_false (tag >= ASN_TAG_BER))
…		…
876	// and adjust later	909	// and adjust later
877	need (1);	910	need (1);
878	STRLEN mark = len_fixup_mark ();	911	STRLEN mark = len_fixup_mark ();
879		912
880	if (expect_false (!SvROK (data) \|\| SvTYPE (SvRV (data)) != SVt_PVAV))	913	if (expect_false (!SvROK (data) \|\| SvTYPE (SvRV (data)) != SVt_PVAV))
881	croak ("BER constructed data must be array-reference");	914	croak ("BER CONSTRUCTED data must be array-reference");
882		915
883	AV av = (AV )SvRV (data);	916	AV av = (AV )SvRV (data);
884	int fill = AvFILL (av);	917	int fill = AvFILL (av);
885		918
886	if (expect_false (SvRMAGICAL (av)))	919	if (expect_false (SvRMAGICAL (av)))
887	croak ("BER constructed data must not be tied");	920	croak ("BER CONSTRUCTED data must not be tied");
888		921
889	int i;	922	int i;
890	for (i = 0; i <= fill; ++i)	923	for (i = 0; i <= fill; ++i)
891	encode_ber (AvARRAY (av)[i]);	924	encode_ber (AvARRAY (av)[i]);
892		925
…		…
899	put_length (0);	932	put_length (0);
900	break;	933	break;
901		934
902	case BER_TYPE_BOOL:	935	case BER_TYPE_BOOL:
903	put_length (1);	936	put_length (1);
904	*cur++ = SvTRUE (data) ? 0xff : 0x00;	937	*cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
905	break;	938	break;
906		939
907	case BER_TYPE_OID:	940	case BER_TYPE_OID:
908	encode_oid (data, 0);	941	encode_oid (data, 0);
909	break;	942	break;
…		…
947	case BER_TYPE_UCS4:	980	case BER_TYPE_UCS4:
948	encode_ucs (data, 4);	981	encode_ucs (data, 4);
949	break;	982	break;
950		983
951	case BER_TYPE_REAL:	984	case BER_TYPE_REAL:
		985	croak ("BER_TYPE_REAL not implemented");
		986
952	case BER_TYPE_CROAK:	987	case BER_TYPE_CROAK:
		988	croak ("class/tag %d/%d mapped to BER_TYPE_CROAK", klass, tag);
		989
953	default:	990	default:
954	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);	991	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
955	}	992	}
956		993
957	}	994	}
…		…
972	const char *name;	1009	const char *name;
973	IV iv;	1010	IV iv;
974	} *civ, const_iv[] = {	1011	} *civ, const_iv[] = {
975	#define const_iv(name) { # name, name },	1012	#define const_iv(name) { # name, name },
976	const_iv (ASN_BOOLEAN)	1013	const_iv (ASN_BOOLEAN)
977	const_iv (ASN_INTEGER32)	1014	const_iv (ASN_INTEGER)
978	const_iv (ASN_BIT_STRING)	1015	const_iv (ASN_BIT_STRING)
979	const_iv (ASN_OCTET_STRING)	1016	const_iv (ASN_OCTET_STRING)
980	const_iv (ASN_NULL)	1017	const_iv (ASN_NULL)
981	const_iv (ASN_OBJECT_IDENTIFIER)	1018	const_iv (ASN_OBJECT_IDENTIFIER)
982	const_iv (ASN_OBJECT_DESCRIPTOR)	1019	const_iv (ASN_OBJECT_DESCRIPTOR)
…		…
1011	const_iv (ASN_CONTEXT)	1048	const_iv (ASN_CONTEXT)
1012	const_iv (ASN_PRIVATE)	1049	const_iv (ASN_PRIVATE)
1013		1050
1014	const_iv (BER_CLASS)	1051	const_iv (BER_CLASS)
1015	const_iv (BER_TAG)	1052	const_iv (BER_TAG)
1016	const_iv (BER_CONSTRUCTED)	1053	const_iv (BER_FLAGS)
1017	const_iv (BER_DATA)	1054	const_iv (BER_DATA)
1018		1055
1019	const_iv (BER_TYPE_BYTES)	1056	const_iv (BER_TYPE_BYTES)
1020	const_iv (BER_TYPE_UTF8)	1057	const_iv (BER_TYPE_UTF8)
1021	const_iv (BER_TYPE_UCS2)	1058	const_iv (BER_TYPE_UCS2)
…		…
1029	const_iv (BER_TYPE_IPADDRESS)	1066	const_iv (BER_TYPE_IPADDRESS)
1030	const_iv (BER_TYPE_CROAK)	1067	const_iv (BER_TYPE_CROAK)
1031		1068
1032	const_iv (SNMP_IPADDRESS)	1069	const_iv (SNMP_IPADDRESS)
1033	const_iv (SNMP_COUNTER32)	1070	const_iv (SNMP_COUNTER32)
		1071	const_iv (SNMP_GAUGE32)
1034	const_iv (SNMP_UNSIGNED32)	1072	const_iv (SNMP_UNSIGNED32)
1035	const_iv (SNMP_TIMETICKS)	1073	const_iv (SNMP_TIMETICKS)
1036	const_iv (SNMP_OPAQUE)	1074	const_iv (SNMP_OPAQUE)
1037	const_iv (SNMP_COUNTER64)	1075	const_iv (SNMP_COUNTER64)
1038	};	1076	};
1039		1077
1040	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--)
1041	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	1079	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1042	}	1080	}
1043		1081
1044	SV *	1082	void
1045	ber_decode (SV ber, SV profile = &PL_sv_undef)	1083	ber_decode (SV ber, SV profile = &PL_sv_undef)
		1084	ALIAS:
		1085	ber_decode_prefix = 1
1046	CODE:	1086	PPCODE:
1047	{	1087	{
1048	cur_profile = SvPROFILE (profile);	1088	cur_profile = SvPROFILE (profile);
1049	STRLEN len;	1089	STRLEN len;
1050	buf = (U8 *)SvPVbyte (ber, len);	1090	buf = (U8 *)SvPVbyte (ber, len);
1051	cur = buf;	1091	cur = buf;
1052	end = buf + len;	1092	end = buf + len;
1053		1093
1054	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");
1055	}	1103	}
1056	OUTPUT: RETVAL
1057		1104
1058	void	1105	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)	1106	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:	1107	PPCODE:
1061	{	1108	{
1062	if (!SvOK (tuple))	1109	if (!SvOK (tuple))
1063	XSRETURN_NO;	1110	XSRETURN_NO;
1064		1111
…		…
1066	croak ("ber_is: tuple must be BER tuple (array-ref)");	1113	croak ("ber_is: tuple must be BER tuple (array-ref)");
1067		1114
1068	AV av = (AV )SvRV (tuple);	1115	AV av = (AV )SvRV (tuple);
1069		1116
1070	XPUSHs (	1117	XPUSHs (
1071	(!SvOK (klass) \|\| SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass))	1118	(!SvOK (klass) \|\| SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1072	&& (!SvOK (tag) \|\| SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))	1119	&& (!SvOK (tag) \|\| SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1073	&& (!SvOK (constructed) \|\| !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed))	1120	&& (!SvOK (flags) \|\| !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1074	&& (!SvOK (data) \|\| sv_eq (AvARRAY (av)[BER_DATA ], data))	1121	&& (!SvOK (data) \|\| sv_eq (AvARRAY (av)[BER_DATA ], data))
1075	? &PL_sv_yes : &PL_sv_undef);	1122	? &PL_sv_yes : &PL_sv_undef);
1076	}	1123	}
1077		1124
1078	void	1125	void
1079	ber_is_seq (SV *tuple)	1126	ber_is_seq (SV *tuple)
…		…
1083	XSRETURN_UNDEF;	1130	XSRETURN_UNDEF;
1084		1131
1085	AV *av = ber_tuple (tuple);	1132	AV *av = ber_tuple (tuple);
1086		1133
1087	XPUSHs (	1134	XPUSHs (
1088	SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL	1135	SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1089	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE	1136	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1090	&& SvIV (AvARRAY (av)[BER_CONSTRUCTED])	1137	&& SvIV (AvARRAY (av)[BER_FLAGS])
1091	? AvARRAY (av)[BER_DATA] : &PL_sv_undef);	1138	? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1092	}	1139	}
1093		1140
1094	void	1141	void
1095	ber_is_i32 (SV tuple, SV value = &PL_sv_undef)	1142	ber_is_int (SV tuple, SV value = &PL_sv_undef)
1096	PPCODE:	1143	PPCODE:
1097	{	1144	{
1098	if (!SvOK (tuple))	1145	if (!SvOK (tuple))
1099	XSRETURN_NO;	1146	XSRETURN_NO;
1100		1147
1101	AV *av = ber_tuple (tuple);	1148	AV *av = ber_tuple (tuple);
1102		1149
1103	IV data = SvIV (AvARRAY (av)[BER_DATA]);	1150	UV data = SvUV (AvARRAY (av)[BER_DATA]);
1104		1151
1105	XPUSHs (	1152	XPUSHs (
1106	SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL	1153	SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1107	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32	1154	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1108	&& !SvIV (AvARRAY (av)[BER_CONSTRUCTED])	1155	&& !SvIV (AvARRAY (av)[BER_FLAGS])
1109	&& (!SvOK (value) \|\| data == SvIV (value))	1156	&& (!SvOK (value) \|\| data == SvUV (value))
1110	? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0))	1157	? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1111	: &PL_sv_undef);	1158	: &PL_sv_undef);
1112	}	1159	}
1113		1160
1114	void	1161	void
1115	ber_is_oid (SV tuple, SV oid = &PL_sv_undef)	1162	ber_is_oid (SV tuple, SV oid = &PL_sv_undef)
…		…
1119	XSRETURN_NO;	1166	XSRETURN_NO;
1120		1167
1121	AV *av = ber_tuple (tuple);	1168	AV *av = ber_tuple (tuple);
1122		1169
1123	XPUSHs (	1170	XPUSHs (
1124	SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL	1171	SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1125	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER	1172	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1126	&& !SvIV (AvARRAY (av)[BER_CONSTRUCTED])	1173	&& !SvIV (AvARRAY (av)[BER_FLAGS])
1127	&& (!SvOK (oid) \|\| sv_eq (AvARRAY (av)[BER_DATA], oid))	1174	&& (!SvOK (oid) \|\| sv_eq (AvARRAY (av)[BER_DATA], oid))
1128	? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);	1175	? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1129	}	1176	}
1130		1177
1131	#############################################################################	1178	#############################################################################
…		…
1144	SvCUR_set (buf_sv, cur - buf);	1191	SvCUR_set (buf_sv, cur - buf);
1145	XPUSHs (buf_sv);	1192	XPUSHs (buf_sv);
1146	}	1193	}
1147		1194
1148	SV *	1195	SV *
1149	ber_i32 (IV iv)	1196	ber_int (SV *sv)
1150	CODE:	1197	CODE:
1151	{	1198	{
1152	AV *av = newAV ();	1199	AV *av = newAV ();
1153	av_fill (av, BER_ARRAYSIZE - 1);	1200	av_fill (av, BER_ARRAYSIZE - 1);
1154	AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL);	1201	AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1155	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32);	1202	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1156	AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0);	1203	AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1157	AvARRAY (av)[BER_DATA ] = newSViv (iv);	1204	AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1158	RETVAL = newRV_noinc ((SV *)av);	1205	RETVAL = newRV_noinc ((SV *)av);
1159	}	1206	}
1160	OUTPUT: RETVAL	1207	OUTPUT: RETVAL
1161		1208
1162	# TODO: not arrayref, but elements?	1209	# TODO: not arrayref, but elements?
…		…
1164	ber_seq (SV *arrayref)	1211	ber_seq (SV *arrayref)
1165	CODE:	1212	CODE:
1166	{	1213	{
1167	AV *av = newAV ();	1214	AV *av = newAV ();
1168	av_fill (av, BER_ARRAYSIZE - 1);	1215	av_fill (av, BER_ARRAYSIZE - 1);
1169	AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL);	1216	AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1170	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);	1217	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1171	AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1);	1218	AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1172	AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);	1219	AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1173	RETVAL = newRV_noinc ((SV *)av);	1220	RETVAL = newRV_noinc ((SV *)av);
1174	}	1221	}
1175	OUTPUT: RETVAL	1222	OUTPUT: RETVAL
1176		1223
1177	MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile	1224	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.14 by root, Sat Apr 20 14:09:56 2019 UTC vs. Revision 1.30 by root, Tue Apr 23 20:03:08 2019 UTC

Diff Legend

Comparing Convert-BER-XS/XS.xs (file contents):
Revision 1.14 by root, Sat Apr 20 14:09:56 2019 UTC vs.
Revision 1.30 by root, Tue Apr 23 20:03:08 2019 UTC