aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/llbase32.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llcommon/llbase32.cpp32
1 files changed, 30 insertions, 2 deletions
diff --git a/linden/indra/llcommon/llbase32.cpp b/linden/indra/llcommon/llbase32.cpp
index 711ba63..27f7284 100644
--- a/linden/indra/llcommon/llbase32.cpp
+++ b/linden/indra/llcommon/llbase32.cpp
@@ -6,6 +6,32 @@
6 * Based on code from bitter 6 * Based on code from bitter
7 * http://ghostwhitecrab.com/bitter/ 7 * http://ghostwhitecrab.com/bitter/
8 * 8 *
9 * Some parts of this file are:
10 * Copyright (c) 2007-2007, Linden Research, Inc.
11 *
12 * Second Life Viewer Source Code
13 * The source code in this file ("Source Code") is provided by Linden Lab
14 * to you under the terms of the GNU General Public License, version 2.0
15 * ("GPL"), unless you have obtained a separate licensing agreement
16 * ("Other License"), formally executed by you and Linden Lab. Terms of
17 * the GPL can be found in doc/GPL-license.txt in this distribution, or
18 * online at http://secondlife.com/developers/opensource/gplv2
19 *
20 * There are special exceptions to the terms and conditions of the GPL as
21 * it is applied to this Source Code. View the full text of the exception
22 * in the file doc/FLOSS-exception.txt in this software distribution, or
23 * online at http://secondlife.com/developers/opensource/flossexception
24 *
25 * By copying, modifying or distributing this software, you acknowledge
26 * that you have read and understood your obligations described above,
27 * and agree to abide by those obligations.
28 *
29 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
30 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
31 * COMPLETENESS OR PERFORMANCE.
32 */
33
34/**
9 * Copyright (c) 2006 Christian Biere <christianbiere@gmx.de> 35 * Copyright (c) 2006 Christian Biere <christianbiere@gmx.de>
10 * All rights reserved. 36 * All rights reserved.
11 * 37 *
@@ -192,6 +218,8 @@ base32_decode(char *dst, size_t size, const void *data, size_t len)
192*/ 218*/
193 219
194 220
221// The following is
222// Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
195// static 223// static
196std::string LLBase32::encode(const U8* input, size_t input_size) 224std::string LLBase32::encode(const U8* input, size_t input_size)
197{ 225{
@@ -207,8 +235,8 @@ std::string LLBase32::encode(const U8* input, size_t input_size)
207 235
208 size_t encoded = base32_encode(&output[0], output_size, input, input_size); 236 size_t encoded = base32_encode(&output[0], output_size, input, input_size);
209 237
210 llinfos << "encoded " << encoded << " into buffer of size " << output_size 238 llinfos << "encoded " << encoded << " into buffer of size "
211 << llendl; 239 << output_size << llendl;
212 } 240 }
213 return output; 241 return output;
214} 242}