Two questions for Glenn Reynolds

(1)If Massoud Ali Mohammadi was killed by the Iranian government because he was reportedly sympathetic to opponents of it, would that terrorism?

(2) If on the other hand he was working an an atomic weapons program for the Iranian government, and was as a consequence quietly killed by the CIA, would that be terrorism?

This is an open book exam. Please be sure to support your answer with specific references to the relevant legal texts and doctrines.