Who may have, and was convicted of, doing something else not that heroic (disclosing covert agent's identities) completely separate from the water-boarding disclosures.

It's convenient for Kiriakou to gloss over the events he was convicted of and insist that it was merely retribution (which of course it might be, but good luck proving that). His statements about persecution have to be taken with some grains of salt.