Back-port rfc6979 support