Analytic two-loop results for self-energy- and vertex-type diagrams with one non-zero mass