Use correct digest when exporting keying material. PR#3319 (Imported from upstream's 87a0cbdf2ee539ea922f9cf7a4b7c2c03119891d)