- (djm) Merge OpenBSD changes:

[openssh.git] / kex.h

diff --git a/kex.h b/kex.h
index 7e5c67024bff2f2676cd3ab403d369199c883feb..8c89687b6068f23c166161ca44c9e7f01b0bf8f9 100644 (file)
--- a/kex.h
+++ b/kex.h
@@ -9,11 +9,6 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Markus Friedl.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES