Yep. When at all possible, use cryptographic tools that natively support the features you want rather than trying to bolt them on top yourself.