[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/network/konversation/src
From:       Eike Hein <hein () kde ! org>
Date:       2006-09-23 21:55:37
Message-ID: 1159048537.353397.10482.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 587743 by hein:

After the next run, we should now be at zero EBN issues
for all code, APIDOX and DocBook checks.


 M  +7 -0      blowfish/BlowfishCbc.cpp  
 M  +7 -0      blowfish/BlowfishCbc.h  
 M  +31 -8     blowfish/b64stuff.cpp  
 M  +32 -3     blowfish/b64stuff.h  
 M  +3 -3      blowfish/oldblowfish.cpp  
 M  +4 -2      blowfish/oldblowfish1.h  
 M  +7 -0      blowfish/oldblowfish2.h  
 M  +0 -2      outputfilter.cpp  


--- trunk/extragear/network/konversation/src/blowfish/BlowfishCbc.cpp #587742:587743
@@ -1,3 +1,10 @@
+/*
+  Public Domain. Without any warranty.
+
+  Copyright (C) George Anescu <unknown@unknown>
+  Copyright (C) mouser <fvarick@users.sourceforge.net>
+*/
+
 //---------------------------------------------------------------------------
 //The implementation of blowfish for CBC mode is from \
http://www.thecodeproject.com/cpp/blowfish.asp by George Anescu  //  I removed \
                exception handling, so it is callers responsibility to insure
--- trunk/extragear/network/konversation/src/blowfish/BlowfishCbc.h #587742:587743
@@ -1,3 +1,10 @@
+/*
+  Public Domain. Without any warranty.
+
+  Copyright (C) George Anescu <unknown@unknown>
+  Copyright (C) mouser <fvarick@users.sourceforge.net>
+*/
+
 //---------------------------------------------------------------------------
 //The implementation of blowfish for CBC mode is from \
http://www.thecodeproject.com/cpp/blowfish.asp by George Anescu  //  I removed \
                exception handling, so it is callers responsibility to insure
--- trunk/extragear/network/konversation/src/blowfish/b64stuff.cpp #587742:587743
@@ -1,18 +1,41 @@
-//---------------------------------------------------------------------------
-//The base64 code used is from 'The Secure Programming Cookbook for C and C++', By \
                John Viega, Matt Messier
-// i hit memory fault suggesting improper # of bytes allocated
-// i changed from alloc to new/delete to match our expected allocation return \
                freeing
-//---------------------------------------------------------------------------
+/*
+  Copyright (C) John Viega <viega@viega.org>
+  Copyright (C) Matt Messier <mmessier@prilnari.com>
 
-//---------------------------------------------------------------------------
-#include "b64stuff.h"
-//---------------------------------------------------------------------------
+  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. Neither the name of the <OWNER> nor the names of its
+     contributors may be used to endorse or promote products derived from
+     this software without specific prior written permission.
 
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "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 COPYRIGHT
+  OWNER OR CONTRIBUTORS 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.
+*/
 
+
 //---------------------------------------------------------------------------
+#include "b64stuff.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 //static char b64table[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 //                           "abcdefghijklmnopqrstuvwxyz"
 //                           "0123456789+/";
--- trunk/extragear/network/konversation/src/blowfish/b64stuff.h #587742:587743
@@ -1,7 +1,36 @@
-//---------------------------------------------------------------------------
-//The base64 code used is from 'The Secure Programming Cookbook for C and C++', By \
                John Viega, Matt Messier
-//---------------------------------------------------------------------------
+/*
+  Copyright (C) John Viega <viega@viega.org>
+  Copyright (C) Matt Messier <mmessier@prilnari.com>
 
+  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. Neither the name of the <OWNER> nor the names of its
+     contributors may be used to endorse or promote products derived from
+     this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "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 COPYRIGHT
+  OWNER OR CONTRIBUTORS 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.
+*/
+
+
 //---------------------------------------------------------------------------
 // To prevent multiple includes
 #ifndef _b64stuffh
--- trunk/extragear/network/konversation/src/blowfish/oldblowfish.cpp #587742:587743
@@ -10,9 +10,9 @@
   Bruce Schneier, 1996, Applied Cryptography, 2nd ed., John Wiley & Sons
   Blowfish Eggdrop algorythms:  Robey Pointer
 
-  Copyright (C) 1994 Bruce Schneier
-  Copyright (C) 1996 Jim Conger
-  Copyright (C) Robey Pointer
+  Copyright (C) 1994 Bruce Schneier <schneier@counterpane.com>
+  Copyright (C) 1996 Jim Conger <jconger@cox.net>
+  Copyright (C) Robey Pointer <robey@lag.net>
 */
 
 //---------------------------------------------------------------------------
--- trunk/extragear/network/konversation/src/blowfish/oldblowfish1.h #587742:587743
@@ -3,8 +3,10 @@
   _THE BLOWFISH ENCRYPTION ALGORITHM_
   by Bruce Schneier, 1996, Applied Cryptography, 2nd ed., John Wiley & Sons
 
-  Copyright (C) 1994 Bruce Schneier
-  Copyright (C) 1996 Jim Conger
+  Public Domain.
+
+  Copyright (C) 1994 Bruce Schneier <schneier@counterpane.com>
+  Copyright (C) 1996 Jim Conger <jconger@cox.net>
 */
 
 //---------------------------------------------------------------------------
--- trunk/extragear/network/konversation/src/blowfish/oldblowfish2.h #587742:587743
@@ -1,4 +1,11 @@
 /*
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+*/
+
+/*
   Copyright (C) 2005 Ismail Donmez <ismail@kde.org>
 */
 
--- trunk/extragear/network/konversation/src/outputfilter.cpp #587742:587743
@@ -1,5 +1,3 @@
-// -*- mode: c++; c-file-style: "bsd"; c-basic-offset: 4; tabs-width: 4; \
                indent-tabs-mode: nil -*-
-
 /*
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic