1c1
< /* OPENBSD ORIGINAL: include/readpassphrase.h */
---
> /* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $ */
3,4d2
< /* $OpenBSD: readpassphrase.h,v 1.3 2002/06/28 12:32:22 millert Exp $ */
<
6,7c4
< * Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
< * All rights reserved.
---
> * Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller@courtesan.com>
9,18c6,8
< * Redistribution and use in source and binary forms, with or without
< * modification, are permitted provided that the following conditions
< * are met:
< * 1. Redistributions of source code must retain the above copyright
< * notice, this list of conditions and the following disclaimer.
< * 2. Redistributions in binary form must reproduce the above copyright
< * notice, this list of conditions and the following disclaimer in the
< * documentation and/or other materials provided with the distribution.
< * 3. The name of the author may not be used to endorse or promote products
< * derived from this software without specific prior written permission.
---
> * Permission to use, copy, modify, and distribute this software for any
> * purpose with or without fee is hereby granted, provided that the above
> * copyright notice and this permission notice appear in all copies.
20,29c10,20
< * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
< * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
< * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
< * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
< * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
< * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
< * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
< * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
< * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
< * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---
> * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
> * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
> * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
> * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
> * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
> * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> *
> * Sponsored in part by the Defense Advanced Research Projects
> * Agency (DARPA) and Air Force Research Laboratory, Air Force
> * Materiel Command, USAF, under agreement number F39502-99-1-0512.
31a23,24
> /* OPENBSD ORIGINAL: include/readpassphrase.h */
>
< /* OPENBSD ORIGINAL: include/readpassphrase.h */
---
> /* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $ */
3,4d2
< /* $OpenBSD: readpassphrase.h,v 1.3 2002/06/28 12:32:22 millert Exp $ */
<
6,7c4
< * Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
< * All rights reserved.
---
> * Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller@courtesan.com>
9,18c6,8
< * Redistribution and use in source and binary forms, with or without
< * modification, are permitted provided that the following conditions
< * are met:
< * 1. Redistributions of source code must retain the above copyright
< * notice, this list of conditions and the following disclaimer.
< * 2. Redistributions in binary form must reproduce the above copyright
< * notice, this list of conditions and the following disclaimer in the
< * documentation and/or other materials provided with the distribution.
< * 3. The name of the author may not be used to endorse or promote products
< * derived from this software without specific prior written permission.
---
> * Permission to use, copy, modify, and distribute this software for any
> * purpose with or without fee is hereby granted, provided that the above
> * copyright notice and this permission notice appear in all copies.
20,29c10,20
< * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
< * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
< * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
< * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
< * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
< * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
< * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
< * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
< * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
< * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---
> * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
> * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
> * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
> * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
> * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
> * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> *
> * Sponsored in part by the Defense Advanced Research Projects
> * Agency (DARPA) and Air Force Research Laboratory, Air Force
> * Materiel Command, USAF, under agreement number F39502-99-1-0512.
31a23,24
> /* OPENBSD ORIGINAL: include/readpassphrase.h */
>