“Cryptology” is an umbrella term that encompasses cryptography and cryptoanalysis.
Wikipedia foundation.