Update the address of the Free Software Foundation in all copyright headers.

[tinc] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 5e45360..a88c36b 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -13,11 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
@@ -130,8 +128,7 @@ bool send_metakey(connection_t *c)
 
        buffer = alloca(2 * len + 1);
        
-       if(!c->outkey)
-               c->outkey = xmalloc(len);
+       c->outkey = xrealloc(c->outkey, len);
 
        if(!c->outctx)
                c->outctx = xmalloc_and_zero(sizeof(*c->outctx));
@@ -227,8 +224,7 @@ bool metakey_h(connection_t *c)
 
        /* Allocate buffers for the meta key */
 
-       if(!c->inkey)
-               c->inkey = xmalloc(len);
+       c->inkey = xrealloc(c->inkey, len);
 
        if(!c->inctx)
                c->inctx = xmalloc_and_zero(sizeof(*c->inctx));
@@ -317,8 +313,7 @@ bool send_challenge(connection_t *c)
 
        buffer = alloca(2 * len + 1);
 
-       if(!c->hischallenge)
-               c->hischallenge = xmalloc(len);
+       c->hischallenge = xrealloc(c->hischallenge, len);
 
        /* Copy random data to the buffer */
 
@@ -359,8 +354,7 @@ bool challenge_h(connection_t *c)
 
        /* Allocate buffers for the challenge */
 
-       if(!c->mychallenge)
-               c->mychallenge = xmalloc(len);
+       c->mychallenge = xrealloc(c->mychallenge, len);
 
        /* Convert the challenge from hexadecimal back to binary */