Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

MFC: r269806,r269809,r269811,r269810

r269806:
Fix too long (seed length >12 chars) challenge handling.
1) " ext" length should be included into OPIE_CHALLENGE_MAX (as all places
of opie code expects that).
2) Overflow check in challenge.c is off by 1 even with corrected
OPIE_CHALLENGE_MAX
3) When fallback to randomchallenge() happens and rval is 0 (i.e.
challenge is too long), its value should be set to error state too.

To demonstrate the bug, run opiepasswd with valid seed:
opiepasswd -s 1234567890123456
and notice that it falls back to randomchallenge() (i.e. no
1234567890123456 in the prompt).

r269809:
When sha1 support was added, they forget to increase OPIE_HASHNAME_MAX

r269811:
Last '/' for program name, not first one.

r269810:
Link otp-sha1 to match real challenge prompt, not otp-sha.

PR: 191511
Submitted by: mitsururike@gmail.com (partially, PR 269806)

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

In contrib/opie/opiekey.c, use the correct length to zero the secret.

Found by: clang ToT
Reviewed by: delphij
MFC after: 3 days

Resolve conflicts.

Make the -a flag to opiekey(1) actually work as advertised.

Reviewed by: ache, audit, security
MFC after: 1 week

Fix uninitialized "force" variable.

PR: 23203
Submitted by: fenner
Approved by: markm

This commit was generated by cvs2svn to compensate for changes in r59118,
which included commits to RCS files with non-trunk default branches.

Upgrade to OPIE 2.32, from http://www.inner.net/pub/opie/

Upgrade to 2.31

Initial import of OPIE v2.3 from
ftp://ftp.nrl.navy.mil/pub/security/opie/