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

Comparing Convert-BER-XS/XS.xs (file contents):
Revision 1.12 by root, Sat Apr 20 12:35:03 2019 UTC vs.
Revision 1.20 by root, Sat Apr 20 17:04:35 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,
…		…
80	BER_TYPE_IPADDRESS,	80	BER_TYPE_IPADDRESS,
81	BER_TYPE_CROAK,	81	BER_TYPE_CROAK,
82	};	82	};
83		83
84	enum {	84	enum {
85	BER_CLASS = 0,	85	BER_CLASS = 0,
86	BER_TAG = 1,	86	BER_TAG = 1,
87	BER_CONSTRUCTED = 2,	87	BER_FLAGS = 2,
88	BER_DATA = 3,	88	BER_DATA = 3,
89	BER_ARRAYSIZE	89	BER_ARRAYSIZE
90	};	90	};
91		91
92	#define MAX_OID_STRLEN 4096	92	#define MAX_OID_STRLEN 4096
93		93
…		…
181		181
182	SvPVX (sv)[idx] = type;	182	SvPVX (sv)[idx] = type;
183	}	183	}
184		184
185	static SV *	185	static SV *
186	profile_new ()	186	profile_new (void)
187	{	187	{
188	SV *sv = newSVpvn ("", 0);	188	SV *sv = newSVpvn ("", 0);
189		189
190	static const struct {	190	static const struct {
191	int klass;	191	int klass;
192	int tag;	192	int tag;
193	int type;	193	int type;
194	} *celem, default_map[] = {	194	} *celem, default_map[] = {
195	{ ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },	195	{ ASN_UNIVERSAL, ASN_BOOLEAN , BER_TYPE_BOOL },
196	{ ASN_UNIVERSAL, ASN_INTEGER32 , BER_TYPE_INT },	196	{ ASN_UNIVERSAL, ASN_INTEGER , BER_TYPE_INT },
197	{ ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },	197	{ ASN_UNIVERSAL, ASN_NULL , BER_TYPE_NULL },
198	{ ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },	198	{ ASN_UNIVERSAL, ASN_OBJECT_IDENTIFIER, BER_TYPE_OID },
199	{ ASN_UNIVERSAL, ASN_OBJECT_DESCRIPTOR, BER_TYPE_OID },
200	{ ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },	199	{ ASN_UNIVERSAL, ASN_RELATIVE_OID , BER_TYPE_RELOID },
201	{ ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },	200	{ ASN_UNIVERSAL, ASN_REAL , BER_TYPE_REAL },
		201	{ ASN_UNIVERSAL, ASN_ENUMERATED , BER_TYPE_INT },
202	{ ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },	202	{ ASN_UNIVERSAL, ASN_UTF8_STRING , BER_TYPE_UTF8 },
203	{ ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },	203	{ ASN_UNIVERSAL, ASN_BMP_STRING , BER_TYPE_UCS2 },
204	{ ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },	204	{ ASN_UNIVERSAL, ASN_UNIVERSAL_STRING , BER_TYPE_UCS4 },
205	};	205	};
206		206
…		…
248		248
249	return *cur++;	249	return *cur++;
250	}	250	}
251		251
252	// get ber-encoded integer (i.e. pack "w")	252	// get ber-encoded integer (i.e. pack "w")
253	static U32	253	static UV
254	get_w (void)	254	get_w (void)
255	{	255	{
256	U32 res = 0;	256	UV res = 0;
		257	U8 c = get_u8 ();
		258
		259	if (expect_false (c == 0x80))
		260	error ("illegal BER padding (X.690 8.1.2.4.2, 8.19.2)");
257		261
258	for (;;)	262	for (;;)
259	{	263	{
260	U8 c = get_u8 ();
261	res = (res << 7) \| (c & 0x7f);	264	res = (res << 7) \| (c & 0x7f);
262		265
263	if (!(c & 0x80))	266	if (!(c & 0x80))
264	return res;	267	return res;
265	}
266	}
267		268
		269	c = get_u8 ();
		270	}
		271	}
		272
268	static U32	273	static UV
269	get_length (void)	274	get_length (void)
270	{	275	{
271	U32 res = get_u8 ();	276	UV res = get_u8 ();
272		277
273	if (res & 0x80)	278	if (res & 0x80)
274	{	279	{
275	int cnt = res & 0x7f;	280	int cnt = res & 0x7f;
276	res = 0;	281	res = 0;
277		282
278	switch (cnt)	283	switch (cnt)
279	{	284	{
280	case 0:	285	case 0:
281	error ("indefinite ASN.1 lengths not supported");	286	error ("indefinite ASN.1 lengths not supported");
282	return 0;	287
		288	case 0x7f:
		289	error ("ASN.1 reserved value in length (X.690 8.1.3.5)");
283		290
284	default:	291	default:
285	error ("ASN.1 length too long");	292	error ("ASN.1 length too long (only up to 2**64 octets supported)");
286	return 0;
287		293
		294	case 8: res = (res << 8) \| get_u8 ();
		295	case 7: res = (res << 8) \| get_u8 ();
		296	case 6: res = (res << 8) \| get_u8 ();
		297	case 5: res = (res << 8) \| get_u8 ();
288	case 4: res = (res << 8) \| get_u8 ();	298	case 4: res = (res << 8) \| get_u8 ();
289	case 3: res = (res << 8) \| get_u8 ();	299	case 3: res = (res << 8) \| get_u8 ();
290	case 2: res = (res << 8) \| get_u8 ();	300	case 2: res = (res << 8) \| get_u8 ();
291	case 1: res = (res << 8) \| get_u8 ();	301	case 1: res = (res << 8) \| get_u8 ();
292	}	302	}
…		…
294		304
295	return res;	305	return res;
296	}	306	}
297		307
298	static SV *	308	static SV *
299	decode_int ()	309	decode_int (void)
300	{	310	{
301	int len = get_length ();	311	UV len = get_length ();
302		312
303	if (len <= 0)	313	if (!len)
304	{
305	error ("integer length equal to zero");	314	error ("invalid integer length equal to zero (X.690 8.3.1)");
306	return 0;
307	}
308		315
309	U8 *data = get_n (len);	316	U8 *data = get_n (len);
		317
		318	if (expect_false (len > 1))
		319	{
		320	U16 mask = (data [0] << 8) \| data [1] & 0xff80;
		321
		322	if (expect_false (mask == 0xff80 \|\| mask == 0x0000))
		323	error ("illegal padding in integer (X.690 8.3.2)");
		324	}
310		325
311	int negative = data [0] & 0x80;	326	int negative = data [0] & 0x80;
312		327
313	UV val = negative ? -1 : 0; // copy signbit to all bits	328	UV val = negative ? -1 : 0; // copy signbit to all bits
314		329
…		…
322	}	337	}
323		338
324	static SV *	339	static SV *
325	decode_data (void)	340	decode_data (void)
326	{	341	{
327	U32 len = get_length ();	342	UV len = get_length ();
328	U8 *data = get_n (len);
329	return newSVpvn ((char *)data, len);	343	return newSVpvn ((char *)get_n (len), len);
330	}	344	}
331		345
332	// gelper for decode_object_identifier	346	// helper for decode_object_identifier
333	static char *	347	static char *
334	write_uv (char *buf, U32 u)	348	write_uv (char *buf, UV u)
335	{	349	{
336	// the one-digit case is absolutely predominant, so this pays off (hopefully)	350	// the one-digit case is absolutely predominant, so this pays off (hopefully)
337	if (expect_true (u < 10))	351	if (expect_true (u < 10))
338	*buf++ = u + '0';	352	*buf++ = u + '0';
339	else	353	else
340	{	354	{
		355	// this could be done much faster using branchless fixed-point arithmetics
341	char *beg = buf;	356	char *beg = buf;
342		357
343	do	358	do
344	{	359	{
345	*buf++ = u % 10 + '0';	360	*buf++ = u % 10 + '0';
…		…
347	}	362	}
348	while (u);	363	while (u);
349		364
350	// reverse digits	365	// reverse digits
351	char *ptr = buf;	366	char *ptr = buf;
352	while (--ptr != beg)	367	while (--ptr > beg)
353	{	368	{
354	char c = *ptr;	369	char c = *ptr;
355	ptr = beg;	370	ptr = beg;
356	*beg = c;	371	*beg = c;
357	++beg;	372	++beg;
…		…
362	}	377	}
363		378
364	static SV *	379	static SV *
365	decode_oid (int relative)	380	decode_oid (int relative)
366	{	381	{
367	U32 len = get_length ();	382	UV len = get_length ();
368		383
369	if (len <= 0)	384	if (len <= 0)
370	{	385	{
371	error ("OBJECT IDENTIFIER length equal to zero");	386	error ("OBJECT IDENTIFIER length equal to zero");
372	return &PL_sv_undef;	387	return &PL_sv_undef;
373	}	388	}
374		389
375	U8 *end = cur + len;	390	U8 *end = cur + len;
376	U32 w = get_w ();	391	UV w = get_w ();
377		392
378	static char oid[MAX_OID_STRLEN]; // must be static	393	static char oid[MAX_OID_STRLEN]; // static, becaueds too large for stack
379	char *app = oid;	394	char *app = oid;
380		395
381	if (relative)	396	if (relative)
382	app = write_uv (app, w);	397	app = write_uv (app, w);
383	else	398	else if (w < 2 * 40)
384	{	399	{
385	app = write_uv (app, (U8)w / 40);	400	app = write_uv (app, (U8)w / 40);
386	*app++ = '.';	401	*app++ = '.';
387	app = write_uv (app, (U8)w % 40);	402	app = write_uv (app, (U8)w % 40);
388	}	403	}
		404	else
		405	{
		406	app = write_uv (app, 2);
		407	*app++ = '.';
		408	app = write_uv (app, w - 2 * 40);
		409	}
389		410
		411	while (cur < end)
		412	{
390	// we assume an oid component is never > 64 bytes	413	// we assume an oid component is never > 64 digits
391	while (cur < end && oid + sizeof (oid) - app > 64)	414	if (oid + sizeof (oid) - app < 64)
392	{	415	croak ("BER_TYPE_OID to long to decode");
		416
393	w = get_w ();	417	w = get_w ();
394	*app++ = '.';	418	*app++ = '.';
395	app = write_uv (app, w);	419	app = write_uv (app, w);
396	}	420	}
397		421
…		…
402	static SV *	426	static SV *
403	decode_ucs (int chrsize)	427	decode_ucs (int chrsize)
404	{	428	{
405	SV *res = NEWSV (0, 0);	429	SV *res = NEWSV (0, 0);
406		430
407	U32 len = get_length ();	431	UV len = get_length ();
408		432
409	if (len & (chrsize - 1))	433	if (len & (chrsize - 1))
410	croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);	434	croak ("BER_TYPE_UCS has an invalid number of octets (%d)", len);
411		435
412	while (len)	436	while (len)
…		…
433		457
434	return res;	458	return res;
435	}	459	}
436		460
437	static SV *	461	static SV *
438	decode_ber ()	462	decode_ber (void)
439	{	463	{
440	int identifier = get_u8 ();	464	int identifier = get_u8 ();
441		465
442	SV *res;	466	SV *res;
443		467
…		…
446	int tag = identifier & ASN_TAG_MASK;	470	int tag = identifier & ASN_TAG_MASK;
447		471
448	if (tag == ASN_TAG_BER)	472	if (tag == ASN_TAG_BER)
449	tag = get_w ();	473	tag = get_w ();
450		474
451	if (tag == ASN_TAG_BER)
452	tag = get_w ();
453
454	if (constructed)	475	if (constructed)
455	{	476	{
456	U32 len = get_length ();	477	UV len = get_length ();
457	U32 seqend = (cur - buf) + len;	478	UV seqend = (cur - buf) + len;
458	AV av = (AV )sv_2mortal ((SV *)newAV ());	479	AV av = (AV )sv_2mortal ((SV *)newAV ());
459		480
460	while (cur < buf + seqend)	481	while (cur < buf + seqend)
461	av_push (av, decode_ber ());	482	av_push (av, decode_ber ());
462		483
463	if (cur > buf + seqend)	484	if (cur > buf + seqend)
464	croak ("constructed type %02x overflow (%x %x)\n", identifier, cur - buf, seqend);	485	croak ("constructed type %02x length overflow (0x%x 0x%x)\n", identifier, (int)(cur - buf), (int)seqend);
465		486
466	res = newRV_inc ((SV *)av);	487	res = newRV_inc ((SV *)av);
467	}	488	}
468	else	489	else
469	switch (profile_lookup (cur_profile, klass, tag))	490	switch (profile_lookup (cur_profile, klass, tag))
470	{	491	{
471	case BER_TYPE_NULL:	492	case BER_TYPE_NULL:
		493	{
		494	UV len = get_length ();
		495
		496	if (len)
		497	croak ("BER_TYPE_NULL value with non-zero length %d encountered (X.690 8.8.2)", len);
		498
472	res = &PL_sv_undef;	499	res = &PL_sv_undef;
		500	}
473	break;	501	break;
474		502
475	case BER_TYPE_BOOL:	503	case BER_TYPE_BOOL:
476	{	504	{
477	U32 len = get_length ();	505	UV len = get_length ();
478		506
479	if (len != 1)	507	if (len != 1)
480	croak ("BER_TYPE_BOOLEAN type with invalid length %d encountered", len);	508	croak ("BER_TYPE_BOOLEAN value with invalid length %d encountered (X.690 8.2.1)", len);
481		509
482	res = newSVcacheint (get_u8 () ? 0 : 1);	510	res = newSVcacheint (!!get_u8 ());
483	}	511	}
484	break;	512	break;
485		513
486	case BER_TYPE_OID:	514	case BER_TYPE_OID:
487	res = decode_oid (0);	515	res = decode_oid (0);
…		…
504	res = decode_data ();	532	res = decode_data ();
505	break;	533	break;
506		534
507	case BER_TYPE_IPADDRESS:	535	case BER_TYPE_IPADDRESS:
508	{	536	{
509	U32 len = get_length ();	537	UV len = get_length ();
510		538
511	if (len != 4)	539	if (len != 4)
512	croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered", len);	540	croak ("BER_TYPE_IPADDRESS type with invalid length %d encountered (RFC 2578 7.1.5)", len);
513		541
514	U8 c1 = get_u8 ();	542	U8 c1 = get_u8 ();
515	U8 c2 = get_u8 ();	543	U8 c2 = get_u8 ();
516	U8 c3 = get_u8 ();	544	U8 c3 = get_u8 ();
517	U8 c4 = get_u8 ();	545	U8 c4 = get_u8 ();
…		…
534	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);	562	croak ("unconfigured/unsupported class/tag %d/%d", klass, tag);
535	}	563	}
536		564
537	AV *av = newAV ();	565	AV *av = newAV ();
538	av_fill (av, BER_ARRAYSIZE - 1);	566	av_fill (av, BER_ARRAYSIZE - 1);
539	AvARRAY (av)[BER_CLASS ] = newSVcacheint (klass);	567	AvARRAY (av)[BER_CLASS] = newSVcacheint (klass);
540	AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);	568	AvARRAY (av)[BER_TAG ] = newSVcacheint (tag);
541	AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (constructed ? 1 : 0);	569	AvARRAY (av)[BER_FLAGS] = newSVcacheint (constructed ? 1 : 0);
542	AvARRAY (av)[BER_DATA ] = res;	570	AvARRAY (av)[BER_DATA ] = res;
543		571
544	return newRV_noinc ((SV *)av);	572	return newRV_noinc ((SV *)av);
545	}	573	}
546		574
547	/////////////////////////////////////////////////////////////////////////////	575	/////////////////////////////////////////////////////////////////////////////
…		…
552	strlen_sum (STRLEN l1, STRLEN l2)	580	strlen_sum (STRLEN l1, STRLEN l2)
553	{	581	{
554	size_t sum = l1 + l2;	582	size_t sum = l1 + l2;
555		583
556	if (sum < (size_t)l2 \|\| sum != (size_t)(STRLEN)sum)	584	if (sum < (size_t)l2 \|\| sum != (size_t)(STRLEN)sum)
557	croak ("JSON::XS: string size overflow");	585	croak ("Convert::BER::XS: string size overflow");
558		586
559	return sum;	587	return sum;
560	}	588	}
561		589
562	static void	590	static void
…		…
600	need (1);	628	need (1);
601	*cur++ = val;	629	*cur++ = val;
602	}	630	}
603		631
604	static void	632	static void
605	put_w_nocheck (U32 val)	633	put_w_nocheck (UV val)
606	{	634	{
		635	#if UVSIZE > 4
		636	cur = (val >> 7 9) \| 0x80; cur += val >= ((UV)1 << (7 * 9));
		637	cur = (val >> 7 8) \| 0x80; cur += val >= ((UV)1 << (7 * 8));
		638	cur = (val >> 7 7) \| 0x80; cur += val >= ((UV)1 << (7 * 7));
		639	cur = (val >> 7 6) \| 0x80; cur += val >= ((UV)1 << (7 * 6));
		640	cur = (val >> 7 5) \| 0x80; cur += val >= ((UV)1 << (7 * 5));
		641	#endif
607	cur = (val >> 7 4) \| 0x80; cur += val >= (1 << (7 * 4));	642	cur = (val >> 7 4) \| 0x80; cur += val >= ((UV)1 << (7 * 4));
608	cur = (val >> 7 3) \| 0x80; cur += val >= (1 << (7 * 3));	643	cur = (val >> 7 3) \| 0x80; cur += val >= ((UV)1 << (7 * 3));
609	cur = (val >> 7 2) \| 0x80; cur += val >= (1 << (7 * 2));	644	cur = (val >> 7 2) \| 0x80; cur += val >= ((UV)1 << (7 * 2));
610	cur = (val >> 7 1) \| 0x80; cur += val >= (1 << (7 * 1));	645	cur = (val >> 7 1) \| 0x80; cur += val >= ((UV)1 << (7 * 1));
611	*cur = val & 0x7f; cur += 1;	646	*cur = val & 0x7f; cur += 1;
612	}	647	}
613		648
614	static void	649	static void
615	put_w (U32 val)	650	put_w (UV val)
616	{	651	{
617	need (5); // we only handle up to 5 bytes	652	need (5); // we only handle up to 5 bytes
618		653
619	put_w_nocheck (val);	654	put_w_nocheck (val);
620	}	655	}
621		656
622	static U8 *	657	static U8 *
623	put_length_at (U32 val, U8 *cur)	658	put_length_at (UV val, U8 *cur)
624	{	659	{
625	if (val < 0x7fU)	660	if (val < 0x7fU)
626	*cur++ = val;	661	*cur++ = val;
627	else	662	else
628	{	663	{
629	U8 *lenb = cur++;	664	U8 *lenb = cur++;
630		665
		666	#if UVSIZE > 4
		667	cur = val >> 56; cur += cur > 0;
		668	cur = val >> 48; cur += cur > 0;
		669	cur = val >> 40; cur += cur > 0;
		670	cur = val >> 32; cur += cur > 0;
		671	#endif
631	cur = val >> 24; cur += cur > 0;	672	cur = val >> 24; cur += cur > 0;
632	cur = val >> 16; cur += cur > 0;	673	cur = val >> 16; cur += cur > 0;
633	cur = val >> 8; cur += cur > 0;	674	cur = val >> 8; cur += cur > 0;
634	*cur = val ; cur += 1;	675	*cur = val ; cur += 1;
635		676
…		…
638		679
639	return cur;	680	return cur;
640	}	681	}
641		682
642	static void	683	static void
643	put_length (U32 val)	684	put_length (UV val)
644	{	685	{
645	need (5 + val);	686	need (5 + val);
646	cur = put_length_at (val, cur);	687	cur = put_length_at (val, cur);
647	}	688	}
648		689
649	// return how many bytes the encoded length requires	690	// return how many bytes the encoded length requires
650	static int length_length (U32 val)	691	static int length_length (UV val)
651	{	692	{
652	return val < 0x7fU	693	return val < 0x7fU
653	? 1	694	? 1
654	: 2 + (val > 0xffU) + (val > 0xffffU) + (val > 0xffffffU);	695	: 2
		696	+ (val > 0xffU)
		697	+ (val > 0xffffU)
		698	+ (val > 0xffffffU)
		699	#if UVSIZE > 4
		700	+ (val > 0xffffffffU)
		701	+ (val > 0xffffffffffU)
		702	+ (val > 0xffffffffffffU)
		703	+ (val > 0xffffffffffffffU)
		704	#endif
		705	;
655	}	706	}
656		707
657	static void	708	static void
658	encode_data (const char *ptr, STRLEN len)	709	encode_data (const char *ptr, STRLEN len)
659	{	710	{
…		…
721		772
722	*lenb = cur - lenb - 1;	773	*lenb = cur - lenb - 1;
723	}	774	}
724		775
725	// we don't know the length yet, so we optimistically	776	// we don't know the length yet, so we optimistically
726	// assume the length will need one octet later. if that	777	// assume the length will need one octet later. If that
727	// turns out to be wrong, we memove as needed.	778	// turns out to be wrong, we memmove as needed.
728	// mark the beginning	779	// mark the beginning
729	static STRLEN	780	static STRLEN
730	len_fixup_mark ()	781	len_fixup_mark (void)
731	{	782	{
732	return cur++ - buf;	783	return cur++ - buf;
733	}	784	}
734		785
735	// patch up the length	786	// patch up the length
…		…
844	{	895	{
845	AV *av = ber_tuple (tuple);	896	AV *av = ber_tuple (tuple);
846		897
847	int klass = SvIV (AvARRAY (av)[BER_CLASS]);	898	int klass = SvIV (AvARRAY (av)[BER_CLASS]);
848	int tag = SvIV (AvARRAY (av)[BER_TAG]);	899	int tag = SvIV (AvARRAY (av)[BER_TAG]);
849	int constructed = SvIV (AvARRAY (av)[BER_CONSTRUCTED]) ? ASN_CONSTRUCTED : 0;	900	int constructed = SvIV (AvARRAY (av)[BER_FLAGS]) & 1 ? ASN_CONSTRUCTED : 0;
850	SV *data = AvARRAY (av)[BER_DATA];	901	SV *data = AvARRAY (av)[BER_DATA];
851		902
852	int identifier = (klass << ASN_CLASS_SHIFT) \| constructed;	903	int identifier = (klass << ASN_CLASS_SHIFT) \| constructed;
853		904
854	if (expect_false (tag >= ASN_TAG_BER))	905	if (expect_false (tag >= ASN_TAG_BER))
…		…
888	put_length (0);	939	put_length (0);
889	break;	940	break;
890		941
891	case BER_TYPE_BOOL:	942	case BER_TYPE_BOOL:
892	put_length (1);	943	put_length (1);
893	*cur++ = SvTRUE (data) ? 0xff : 0x00;	944	*cur++ = SvTRUE (data) ? 0xff : 0x00; // 0xff = DER/CER
894	break;	945	break;
895		946
896	case BER_TYPE_OID:	947	case BER_TYPE_OID:
897	encode_oid (data, 0);	948	encode_oid (data, 0);
898	break;	949	break;
…		…
961	const char *name;	1012	const char *name;
962	IV iv;	1013	IV iv;
963	} *civ, const_iv[] = {	1014	} *civ, const_iv[] = {
964	#define const_iv(name) { # name, name },	1015	#define const_iv(name) { # name, name },
965	const_iv (ASN_BOOLEAN)	1016	const_iv (ASN_BOOLEAN)
966	const_iv (ASN_INTEGER32)	1017	const_iv (ASN_INTEGER)
967	const_iv (ASN_BIT_STRING)	1018	const_iv (ASN_BIT_STRING)
968	const_iv (ASN_OCTET_STRING)	1019	const_iv (ASN_OCTET_STRING)
969	const_iv (ASN_NULL)	1020	const_iv (ASN_NULL)
970	const_iv (ASN_OBJECT_IDENTIFIER)	1021	const_iv (ASN_OBJECT_IDENTIFIER)
971	const_iv (ASN_OBJECT_DESCRIPTOR)	1022	const_iv (ASN_OBJECT_DESCRIPTOR)
…		…
1000	const_iv (ASN_CONTEXT)	1051	const_iv (ASN_CONTEXT)
1001	const_iv (ASN_PRIVATE)	1052	const_iv (ASN_PRIVATE)
1002		1053
1003	const_iv (BER_CLASS)	1054	const_iv (BER_CLASS)
1004	const_iv (BER_TAG)	1055	const_iv (BER_TAG)
1005	const_iv (BER_CONSTRUCTED)	1056	const_iv (BER_FLAGS)
1006	const_iv (BER_DATA)	1057	const_iv (BER_DATA)
1007		1058
1008	const_iv (BER_TYPE_BYTES)	1059	const_iv (BER_TYPE_BYTES)
1009	const_iv (BER_TYPE_UTF8)	1060	const_iv (BER_TYPE_UTF8)
1010	const_iv (BER_TYPE_UCS2)	1061	const_iv (BER_TYPE_UCS2)
…		…
1043	RETVAL = decode_ber ();	1094	RETVAL = decode_ber ();
1044	}	1095	}
1045	OUTPUT: RETVAL	1096	OUTPUT: RETVAL
1046		1097
1047	void	1098	void
1048	ber_is (SV tuple, SV klass = &PL_sv_undef, SV tag = &PL_sv_undef, SV constructed = &PL_sv_undef, SV *data = &PL_sv_undef)	1099	ber_is (SV tuple, SV klass = &PL_sv_undef, SV tag = &PL_sv_undef, SV flags = &PL_sv_undef, SV *data = &PL_sv_undef)
1049	PPCODE:	1100	PPCODE:
1050	{	1101	{
1051	if (!SvOK (tuple))	1102	if (!SvOK (tuple))
1052	XSRETURN_NO;	1103	XSRETURN_NO;
1053		1104
…		…
1055	croak ("ber_is: tuple must be BER tuple (array-ref)");	1106	croak ("ber_is: tuple must be BER tuple (array-ref)");
1056		1107
1057	AV av = (AV )SvRV (tuple);	1108	AV av = (AV )SvRV (tuple);
1058		1109
1059	XPUSHs (	1110	XPUSHs (
1060	(!SvOK (klass) \|\| SvIV (AvARRAY (av)[BER_CLASS ]) == SvIV (klass))	1111	(!SvOK (klass) \|\| SvIV (AvARRAY (av)[BER_CLASS]) == SvIV (klass))
1061	&& (!SvOK (tag) \|\| SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))	1112	&& (!SvOK (tag) \|\| SvIV (AvARRAY (av)[BER_TAG ]) == SvIV (tag))
1062	&& (!SvOK (constructed) \|\| !SvIV (AvARRAY (av)[BER_CONSTRUCTED]) == !SvIV (constructed))	1113	&& (!SvOK (flags) \|\| !SvIV (AvARRAY (av)[BER_FLAGS]) == !SvIV (flags))
1063	&& (!SvOK (data) \|\| sv_eq (AvARRAY (av)[BER_DATA ], data))	1114	&& (!SvOK (data) \|\| sv_eq (AvARRAY (av)[BER_DATA ], data))
1064	? &PL_sv_yes : &PL_sv_undef);	1115	? &PL_sv_yes : &PL_sv_undef);
1065	}	1116	}
1066		1117
1067	void	1118	void
1068	ber_is_seq (SV *tuple)	1119	ber_is_seq (SV *tuple)
…		…
1072	XSRETURN_UNDEF;	1123	XSRETURN_UNDEF;
1073		1124
1074	AV *av = ber_tuple (tuple);	1125	AV *av = ber_tuple (tuple);
1075		1126
1076	XPUSHs (	1127	XPUSHs (
1077	SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL	1128	SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1078	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE	1129	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_SEQUENCE
1079	&& SvIV (AvARRAY (av)[BER_CONSTRUCTED])	1130	&& SvIV (AvARRAY (av)[BER_FLAGS])
1080	? AvARRAY (av)[BER_DATA] : &PL_sv_undef);	1131	? AvARRAY (av)[BER_DATA] : &PL_sv_undef);
1081	}	1132	}
1082		1133
1083	void	1134	void
1084	ber_is_i32 (SV tuple, SV value = &PL_sv_undef)	1135	ber_is_int (SV tuple, SV value = &PL_sv_undef)
1085	PPCODE:	1136	PPCODE:
1086	{	1137	{
1087	if (!SvOK (tuple))	1138	if (!SvOK (tuple))
1088	XSRETURN_NO;	1139	XSRETURN_NO;
1089		1140
1090	AV *av = ber_tuple (tuple);	1141	AV *av = ber_tuple (tuple);
1091		1142
1092	IV data = SvIV (AvARRAY (av)[BER_DATA]);	1143	UV data = SvUV (AvARRAY (av)[BER_DATA]);
1093		1144
1094	XPUSHs (	1145	XPUSHs (
1095	SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL	1146	SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1096	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER32	1147	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_INTEGER
1097	&& !SvIV (AvARRAY (av)[BER_CONSTRUCTED])	1148	&& !SvIV (AvARRAY (av)[BER_FLAGS])
1098	&& (!SvOK (value) \|\| data == SvIV (value))	1149	&& (!SvOK (value) \|\| data == SvUV (value))
1099	? sv_2mortal (data ? newSViv (data) : newSVpv ("0 but true", 0))	1150	? sv_2mortal (data ? newSVsv (AvARRAY (av)[BER_DATA]) : newSVpv ("0 but true", 0))
1100	: &PL_sv_undef);	1151	: &PL_sv_undef);
1101	}	1152	}
1102		1153
1103	void	1154	void
1104	ber_is_oid (SV tuple, SV oid = &PL_sv_undef)	1155	ber_is_oid (SV tuple, SV oid = &PL_sv_undef)
…		…
1108	XSRETURN_NO;	1159	XSRETURN_NO;
1109		1160
1110	AV *av = ber_tuple (tuple);	1161	AV *av = ber_tuple (tuple);
1111		1162
1112	XPUSHs (	1163	XPUSHs (
1113	SvIV (AvARRAY (av)[BER_CLASS ]) == ASN_UNIVERSAL	1164	SvIV (AvARRAY (av)[BER_CLASS]) == ASN_UNIVERSAL
1114	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER	1165	&& SvIV (AvARRAY (av)[BER_TAG ]) == ASN_OBJECT_IDENTIFIER
1115	&& !SvIV (AvARRAY (av)[BER_CONSTRUCTED])	1166	&& !SvIV (AvARRAY (av)[BER_FLAGS])
1116	&& (!SvOK (oid) \|\| sv_eq (AvARRAY (av)[BER_DATA], oid))	1167	&& (!SvOK (oid) \|\| sv_eq (AvARRAY (av)[BER_DATA], oid))
1117	? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);	1168	? newSVsv (AvARRAY (av)[BER_DATA]) : &PL_sv_undef);
1118	}	1169	}
1119		1170
1120	#############################################################################	1171	#############################################################################
…		…
1133	SvCUR_set (buf_sv, cur - buf);	1184	SvCUR_set (buf_sv, cur - buf);
1134	XPUSHs (buf_sv);	1185	XPUSHs (buf_sv);
1135	}	1186	}
1136		1187
1137	SV *	1188	SV *
1138	ber_i32 (IV iv)	1189	ber_int (SV *sv)
1139	CODE:	1190	CODE:
1140	{	1191	{
1141	AV *av = newAV ();	1192	AV *av = newAV ();
1142	av_fill (av, BER_ARRAYSIZE - 1);	1193	av_fill (av, BER_ARRAYSIZE - 1);
1143	AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL);	1194	AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1144	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER32);	1195	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_INTEGER);
1145	AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (0);	1196	AvARRAY (av)[BER_FLAGS] = newSVcacheint (0);
1146	AvARRAY (av)[BER_DATA ] = newSViv (iv);	1197	AvARRAY (av)[BER_DATA ] = newSVsv (sv);
1147	RETVAL = newRV_noinc ((SV *)av);	1198	RETVAL = newRV_noinc ((SV *)av);
1148	}	1199	}
1149	OUTPUT: RETVAL	1200	OUTPUT: RETVAL
1150		1201
1151	# TODO: not arrayref, but elements?	1202	# TODO: not arrayref, but elements?
…		…
1153	ber_seq (SV *arrayref)	1204	ber_seq (SV *arrayref)
1154	CODE:	1205	CODE:
1155	{	1206	{
1156	AV *av = newAV ();	1207	AV *av = newAV ();
1157	av_fill (av, BER_ARRAYSIZE - 1);	1208	av_fill (av, BER_ARRAYSIZE - 1);
1158	AvARRAY (av)[BER_CLASS ] = newSVcacheint (ASN_UNIVERSAL);	1209	AvARRAY (av)[BER_CLASS] = newSVcacheint (ASN_UNIVERSAL);
1159	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);	1210	AvARRAY (av)[BER_TAG ] = newSVcacheint (ASN_SEQUENCE);
1160	AvARRAY (av)[BER_CONSTRUCTED] = newSVcacheint (1);	1211	AvARRAY (av)[BER_FLAGS] = newSVcacheint (1);
1161	AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);	1212	AvARRAY (av)[BER_DATA ] = newSVsv (arrayref);
1162	RETVAL = newRV_noinc ((SV *)av);	1213	RETVAL = newRV_noinc ((SV *)av);
1163	}	1214	}
1164	OUTPUT: RETVAL	1215	OUTPUT: RETVAL
1165		1216
1166	MODULE = Convert::BER::XS PACKAGE = Convert::BER::XS::Profile	1217	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.12 by root, Sat Apr 20 12:35:03 2019 UTC vs. Revision 1.20 by root, Sat Apr 20 17:04:35 2019 UTC

Diff Legend

Comparing Convert-BER-XS/XS.xs (file contents):
Revision 1.12 by root, Sat Apr 20 12:35:03 2019 UTC vs.
Revision 1.20 by root, Sat Apr 20 17:04:35 2019 UTC