add Nkey salt to sha1_prf.  Improve overflow detection in incr().  General cleanup