diff options
author | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:09:04 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:09:04 +0000 |
commit | 393f1b414746a7f1977971dd7659dd2b47092b11 (patch) | |
tree | 81d0ca1ee70ab86a7d79c1991abe5c387b655fb2 /src/sha1.cpp | |
parent | c259f95bd0e58b247940a339bb9b4b401b4e9438 (diff) | |
parent | 7e25a863325dc3e9762397e700030969e093b087 (diff) | |
download | libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.gz libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.bz2 libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.xz libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.zip |
Wow! Merged the branch, streams are updated, and there's no more FString, run
the fixstrings.sh script in the support directory to (hopefully) automatically
update your projects.
Diffstat (limited to 'src/sha1.cpp')
-rw-r--r-- | src/sha1.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sha1.cpp b/src/sha1.cpp index a206a78..bfe4c5a 100644 --- a/src/sha1.cpp +++ b/src/sha1.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -38,7 +38,7 @@ void Bu::Sha1::reset() | |||
38 | uTotalBytes = 0; | 38 | uTotalBytes = 0; |
39 | } | 39 | } |
40 | 40 | ||
41 | void Bu::Sha1::setSalt( const Bu::FString & /*sSalt*/ ) | 41 | void Bu::Sha1::setSalt( const Bu::String & /*sSalt*/ ) |
42 | { | 42 | { |
43 | } | 43 | } |
44 | 44 | ||
@@ -73,7 +73,7 @@ void Bu::Sha1::addData( const void *sDataRaw, int iSize ) | |||
73 | } | 73 | } |
74 | } | 74 | } |
75 | 75 | ||
76 | Bu::FString Bu::Sha1::getResult() | 76 | Bu::String Bu::Sha1::getResult() |
77 | { | 77 | { |
78 | // save the message size | 78 | // save the message size |
79 | uint32_t totalBitsL = uTotalBytes << 3; | 79 | uint32_t totalBitsL = uTotalBytes << 3; |
@@ -102,7 +102,7 @@ Bu::FString Bu::Sha1::getResult() | |||
102 | // finish the final block | 102 | // finish the final block |
103 | addData( (char*)footer, iNeededZeros + 8 ); | 103 | addData( (char*)footer, iNeededZeros + 8 ); |
104 | 104 | ||
105 | Bu::FString sRet( 20 ); | 105 | Bu::String sRet( 20 ); |
106 | 106 | ||
107 | unsigned char *digest = (unsigned char *)sRet.getStr(); | 107 | unsigned char *digest = (unsigned char *)sRet.getStr(); |
108 | 108 | ||