253. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 12/5/2017 12:06:43 PM Central Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

253.1 Files compared

#	Location	File	Last Modified
1	IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\ImagingCommon\main\src\java\gov\va\med\imaging\facade\configuration	EncryptedConfigurationPropertyStringSingleValueConverter.java	Mon Dec 4 21:35:06 2017 UTC
2	IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\ImagingCommon\main\src\java\gov\va\med\imaging\facade\configuration	EncryptedConfigurationPropertyStringSingleValueConverter.java	Mon Dec 4 22:02:01 2017 UTC

253.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	3	182
Changed	2	4
Inserted	0	0
Removed	0	0

253.3 Comparison options

Whitespace
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

253.4 Active regular expressions

No regular expressions were active.

253.5 Comparison detail

	1	/**
	2	*
	3	Package: MAG - Vis tA Imaging
	4	WARNING: Per VHA D irective 2 004-038, t his routin e should n ot be modi fied.
	5	Date Cre ated: Apr 25, 2012
	6	Site Nam e: Washin gton OI Fi eld Office , Silver S pring, MD
	7	Developer: WERFEJ
	8	Descript ion:
	9
	10	;; +-------- ---------- ---------- ---------- ---------- ---------- ---------- +
	11	;; Property of the US Government .
	12	;; No permis sion to co py or redi stribute t his softwa re is give n.
	13	;; Use of un released v ersions of this soft ware requi res the us er
	14	;; to execu te a writt en test ag reement wi th the Vis tA Imaging
	15	;; Developm ent Office of the De partment o f Veterans Affairs,
	16	;; telephon e (301) 73 4-0100.
	17	;;
	18	;; The Food and Drug A dministrat ion classi fies this software a s
	19	;; a Class I I medical device. A s such, it may not b e changed
	20	;; in any wa y. Modifi cations to this soft ware may r esult in a n
	21	;; adulterat ed medical device un der 21CFR8 20, the us e of which
	22	;; is consid ered to be a violati on of US F ederal Sta tutes.
	23	;; +-------- ---------- ---------- ---------- ---------- ---------- ---------- +
	24
	25	*/
	26	package go v.va.med.i maging.fac ade.config uration;
	27
	28	import org .apache.lo gging.log4 j.LogManag er;
	29	import org .apache.lo gging.log4 j.Logger;
	30
	31	import gov .va.med.im aging.encr yption.Aes Encryption ;
	32	import gov .va.med.im aging.encr yption.exc eptions.Ae sEncryptio nException ;
	33
	34	import com .thoughtwo rks.xstrea m.converte rs.SingleV alueConver ter;
	35
	36	/**
	37	* @author WERFEJ
	38	*
	39	*/
	40	public cla ss Encrypt edConfigur ationPrope rtyStringS ingleValue Converter
	41	implements SingleVal ueConverte r
	42	{
	43	pr ivate fina l static L ogger logg er = LogMa nager.getL ogger(Encr yptedConfi gurationPr opertyStri ngSingleVa lueConvert er.class);
	44
	45	/* (non-Java doc)
	46	* @see com. thoughtwor ks.xstream .converter s.Converte rMatcher#c anConvert( java.lang. Class)
	47	* /
	48	@S uppressWar nings("raw types")
	49	@O verride
	50	pu blic boole an canConv ert(Class type)
	51	{
	52	retu rn type.eq uals(Encry ptedConfig urationPro pertyStrin g.class);
	53	}
	54
	55	/* (non-Java doc)
	56	* @see com. thoughtwor ks.xstream .converter s.SingleVa lueConvert er#fromStr ing(java.l ang.String )
	57	* /
	58	@O verride
	59	pu blic Objec t fromStri ng(String arg0)
	60	{
	61	Stri ng decrypt edString = null;
	62	if(a rg0 == nul l)
	63	return null;
	64	try
	65	{
	66	decryp tedString = AesEncry ption.deco deByteArra y(arg0);
	67	}
	68	catc h(AesEncry ptionExcep tion aesX)
	69	{
	70	logger .error("Er ror decryt ping strin g, " + aes X.getMessa ge());
	71	}
	72	retu rn new Enc ryptedConf igurationP ropertyStr ing(decryp tedString) ;
	73	}
	74
	75	/* (non-Java doc)
	76	* @see com. thoughtwor ks.xstream .converter s.SingleVa lueConvert er#toStrin g(java.lan g.Object)
	77	* /
	78	@O verride
	79	pu blic Strin g toString (Object ar g0)
	80	{
	81	Encr yptedConfi gurationPr opertyStri ng encrypt edProperty = (Encryp tedConfigu rationProp ertyString )arg0;
	82	try
	83	{
	84	return AesEncryp tion.encry pt(encrypt edProperty .getValue( ));
	85	}
	86	catc h(AesEncry ptionExcep tion aesX)
	87	{
	88	logger .error("Er ror encryp ting strin g [" + enc ryptedProp erty.getVa lue() + "] , " + aesX .getMessag e());
	89	}
	90	retu rn null;
	91	}
	92
	93	}