diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2005-11-10 16:58:47 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2005-11-10 16:58:47 +1100 |
| commit | d76b4c74f808d356ac620fa18ee9e3c3ab75dd0c (patch) | |
| tree | 12e6f35818d59c34916f3eff82e5c8bd78b65b58 /openbsd-compat | |
| parent | dbb631cebe0108bae40ff73fd67f9873abed5cd5 (diff) | |
- (dtucker) [openbsd-compat/readpassphrase.h] Update from OpenBSD 1.3 -> 1.5.
Diffstat (limited to 'openbsd-compat')
| -rw-r--r-- | openbsd-compat/readpassphrase.h | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/openbsd-compat/readpassphrase.h b/openbsd-compat/readpassphrase.h index faab47182..5fd7c5d77 100644 --- a/openbsd-compat/readpassphrase.h +++ b/openbsd-compat/readpassphrase.h | |||
| @@ -1,30 +1,23 @@ | |||
| 1 | /* $OpenBSD: readpassphrase.h,v 1.3 2002/06/28 12:32:22 millert Exp $ */ | 1 | /* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com> | 4 | * Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller@courtesan.com> |
| 5 | * All rights reserved. | ||
| 6 | * | 5 | * |
| 7 | * Redistribution and use in source and binary forms, with or without | 6 | * Permission to use, copy, modify, and distribute this software for any |
| 8 | * modification, are permitted provided that the following conditions | 7 | * purpose with or without fee is hereby granted, provided that the above |
| 9 | * are met: | 8 | * copyright notice and this permission notice appear in all copies. |
| 10 | * 1. Redistributions of source code must retain the above copyright | ||
| 11 | * notice, this list of conditions and the following disclaimer. | ||
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer in the | ||
| 14 | * documentation and/or other materials provided with the distribution. | ||
| 15 | * 3. The name of the author may not be used to endorse or promote products | ||
| 16 | * derived from this software without specific prior written permission. | ||
| 17 | * | 9 | * |
| 18 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, | 10 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
| 19 | * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY | 11 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
| 20 | * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL | 12 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
| 21 | * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 13 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
| 22 | * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 14 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
| 23 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 15 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
| 24 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 16 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
| 25 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 17 | * |
| 26 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 18 | * Sponsored in part by the Defense Advanced Research Projects |
| 27 | * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 19 | * Agency (DARPA) and Air Force Research Laboratory, Air Force |
| 20 | * Materiel Command, USAF, under agreement number F39502-99-1-0512. | ||
| 28 | */ | 21 | */ |
| 29 | 22 | ||
| 30 | /* OPENBSD ORIGINAL: include/readpassphrase.h */ | 23 | /* OPENBSD ORIGINAL: include/readpassphrase.h */ |