Merge pull request #304 from nmav/ocserv-crypt