Attachment #557768 for bug #671380

View | Details | Raw Unified | Return to bug 671380
Collapse All | Expand All




++ b/src/jose_public_key.erl 2018-12-14 13:38:46.681978717 +0100

	try
		public_key:pem_encode(PEMEntries)
	catch
		Class:Reason:ST ->
			ST = erlang:get_stacktrace(),
			case pem_enc(PEMEntries) of
				{true, PEMBinary} ->
					PEMBinary;

		try
			public_key:pem_entry_decode(PEMEntry)
		catch
			Class:Reason:ST ->
				ST = erlang:get_stacktrace(),
				case pem_entry_dec(PEMEntry) of
					{true, DecodedPEMEntry} ->
						DecodedPEMEntry;

		try
			public_key:pem_entry_decode(PEMEntry, Password)
		catch
			Class:Reason:ST ->
				ST = erlang:get_stacktrace(),
				case pem_entry_dec(PEMEntry) of
					{true, DecodedPEMEntry} ->
						DecodedPEMEntry;

	try
		public_key:pem_entry_encode(ASN1Type, Entity)
	catch
		Class:Reason:ST ->
			ST = erlang:get_stacktrace(),
			case pem_entry_enc(ASN1Type, Entity) of
				{true, PEMEntry} ->
					PEMEntry;

	try
		public_key:pem_entry_encode(ASN1Type, Entity, Password)
	catch
		Class:Reason:ST ->
			ST = erlang:get_stacktrace(),
			case pem_entry_enc(ASN1Type, Entity, Password) of
				{true, PEMEntry} ->
					PEMEntry;

	try
		public_key:pem_entry_encode(ASN1Type, Entry, Cipher)
	catch
		Class:Reason:ST ->
			ST = erlang:get_stacktrace(),
			case pem_entry_enc1(ASN1Type, Entry, Cipher) of
				{true, Encoded} ->
					Encoded;

Return to bug 671380

Line Link Here

(-)file_not_specified_in_diff (-13 / +7 lines)
0	-- a/src/jose_public_key.erl 2017-05-19 03:49:53.000000000 +0200	0	++ b/src/jose_public_key.erl 2018-12-14 13:38:46.681978717 +0100
Lines 40-47 Link Here
40	try	40	try
41	public_key:pem_encode(PEMEntries)	41	public_key:pem_encode(PEMEntries)
42	catch	42	catch
43	Class:Reason ->	43	Class:Reason:ST ->
44	ST = erlang:get_stacktrace(),
45	case pem_enc(PEMEntries) of	44	case pem_enc(PEMEntries) of
46	{true, PEMBinary} ->	45	{true, PEMBinary} ->
47	PEMBinary;	46	PEMBinary;
Lines 56-63 Link Here
56	try	55	try
57	public_key:pem_entry_decode(PEMEntry)	56	public_key:pem_entry_decode(PEMEntry)
58	catch	57	catch
59	Class:Reason ->	58	Class:Reason:ST ->
60	ST = erlang:get_stacktrace(),
61	case pem_entry_dec(PEMEntry) of	59	case pem_entry_dec(PEMEntry) of
62	{true, DecodedPEMEntry} ->	60	{true, DecodedPEMEntry} ->
63	DecodedPEMEntry;	61	DecodedPEMEntry;
Lines 80-87 Link Here
80	try	78	try
81	public_key:pem_entry_decode(PEMEntry, Password)	79	public_key:pem_entry_decode(PEMEntry, Password)
82	catch	80	catch
83	Class:Reason ->	81	Class:Reason:ST ->
84	ST = erlang:get_stacktrace(),
85	case pem_entry_dec(PEMEntry) of	82	case pem_entry_dec(PEMEntry) of
86	{true, DecodedPEMEntry} ->	83	{true, DecodedPEMEntry} ->
87	DecodedPEMEntry;	84	DecodedPEMEntry;
Lines 103-110 Link Here
103	try	100	try
104	public_key:pem_entry_encode(ASN1Type, Entity)	101	public_key:pem_entry_encode(ASN1Type, Entity)
105	catch	102	catch
106	Class:Reason ->	103	Class:Reason:ST ->
107	ST = erlang:get_stacktrace(),
108	case pem_entry_enc(ASN1Type, Entity) of	104	case pem_entry_enc(ASN1Type, Entity) of
109	{true, PEMEntry} ->	105	{true, PEMEntry} ->
110	PEMEntry;	106	PEMEntry;
Lines 118-125 Link Here
118	try	114	try
119	public_key:pem_entry_encode(ASN1Type, Entity, Password)	115	public_key:pem_entry_encode(ASN1Type, Entity, Password)
120	catch	116	catch
121	Class:Reason ->	117	Class:Reason:ST ->
122	ST = erlang:get_stacktrace(),
123	case pem_entry_enc(ASN1Type, Entity, Password) of	118	case pem_entry_enc(ASN1Type, Entity, Password) of
124	{true, PEMEntry} ->	119	{true, PEMEntry} ->
125	PEMEntry;	120	PEMEntry;
Lines 230-237 Link Here
230	try	225	try
231	public_key:pem_entry_encode(ASN1Type, Entry, Cipher)	226	public_key:pem_entry_encode(ASN1Type, Entry, Cipher)
232	catch	227	catch
233	Class:Reason ->	228	Class:Reason:ST ->
234	ST = erlang:get_stacktrace(),
235	case pem_entry_enc1(ASN1Type, Entry, Cipher) of	229	case pem_entry_enc1(ASN1Type, Entry, Cipher) of
236	{true, Encoded} ->	230	{true, Encoded} ->
237	Encoded;	231	Encoded;