Did ABC's Nightline Deliberately Run CIA Propaganda?

I just finished watching Brian Ross interview an "ex-CIA agent" named John Kiriakou on Disney's entertainment program Nightline; Coming in From the Cold: CIA Spy Calls Waterboarding Necessary But Torture.

There were many incredulous things in this report which gave the whole segment the taint of political propaganda. First off, Kiriakou claimed that Zubayda cracked after a mere 35 seconds of waterboarding. Secondly, it doesn't make sense that Kiriakou would decide to go in front of the cameras and jeopardize every contact he has made there, putting many of his colleagues in danger, and throwing away any future career opportunities with the Agency. A cherubic, soft-spoken, sensitive-type, Kiriakou gave a human face to Bush's barbaric methods and acted as a great spokesman for the administration, but he tripped up on many points.

Calipygian notes, "Now, we have a guy who has actually waterboarded a suspected terrorist calling it "torture". In effect, this guy has admitted to breaking the law, possibly even committing a war crime... Since the leader of the team that conducted the torture has shown his face on ABC now, can we stop pretending that the tapes were destroyed to protect the identities of the perps from vengeful terrorists?"

Kiriakau spoke of his role in the interrogation of Abu Zubayda in a sensitive way reiterating the Bush talking points that the CIA torture techniques have saved innumerable lives. One viewer wrote in, "Out of one side of his mouth he said torture is bad (playing the good cop) and out of the other side of his mouth he says that if torture helps save lives, then torture away-have at it (bad cop). This whole charade was a complete farce. I can't believe ABC aired this piece of propaganda."

Another wrote, "I just watched the Nightline video of this agent. This is propaganda. Nothing rings true about this report."

According to the Los Angeles Times, Kiriakou served as a CIA counter-terrorism official from 1998 to 2004 and now works closely with Kissinger McLarty Associates in Washington. That would be Henry Kissinger, one of Bush's most trusted advisers on Middle East issues. It would be very disturbing to find out that ABC News is deliberately running government propaganda. Have they? What else do we know about Kiriakou?