update ciphers from upstream, small changes