X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Fdigest.c;h=ff350daa8953d4180e75edfbe09ebbd8045a7ccd;hb=761517c21c37a808a19b487aa116c3c19439feca;hp=7c4dfc238da8f9726408b95ea519af0b8876e57f;hpb=08aabbf9317806bc50a9a6693ca866c8936ce26b;p=tinc

diff --git a/src/openssl/digest.c b/src/openssl/digest.c
index 7c4dfc23..ff350daa 100644
--- a/src/openssl/digest.c
+++ b/src/openssl/digest.c
@@ -12,11 +12,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"
@@ -26,49 +24,71 @@
 #include "digest.h"
 #include "logger.h"
 
-bool digest_open_by_name(digest_t *digest, const char *name) {
+static void set_maclength(digest_t *digest, int maclength) {
+	int digestlen = EVP_MD_size(digest->digest);
+
+	if(maclength > digestlen || maclength < 0)
+		digest->maclength = digestlen;
+	else
+		digest->maclength = maclength;
+}
+
+bool digest_open_by_name(digest_t *digest, const char *name, int maclength) {
 	digest->digest = EVP_get_digestbyname(name);
-	if(digest->digest)
-		return true;
 
-	logger(LOG_DEBUG, _("Unknown digest name '%s'!"), name);
-	return false;
+	if(!digest->digest) {
+		logger(LOG_DEBUG, "Unknown digest name '%s'!", name);
+		return false;
+	}
+
+	set_maclength(digest, maclength);
+	return true;
 }
 
-bool digest_open_by_nid(digest_t *digest, int nid) {
+bool digest_open_by_nid(digest_t *digest, int nid, int maclength) {
 	digest->digest = EVP_get_digestbynid(nid);
-	if(digest->digest)
-		return true;
 
-	logger(LOG_DEBUG, _("Unknown digest nid %d!"), nid);
-	return false;
+	if(!digest->digest) {
+		logger(LOG_DEBUG, "Unknown digest nid %d!", nid);
+		return false;
+	}
+
+	set_maclength(digest, maclength);
+	return true;
 }
 
-bool digest_open_sha1(digest_t *digest) {
+bool digest_open_sha1(digest_t *digest, int maclength) {
 	digest->digest = EVP_sha1();
+
+	set_maclength(digest, maclength);
 	return true;
 }
 
 void digest_close(digest_t *digest) {
 }
 
-bool digest_create(digest_t *digest, void *indata, size_t inlen, void *outdata) {
+bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *outdata) {
+	size_t len = EVP_MD_size(digest->digest);
+	unsigned char tmpdata[len];
+
 	EVP_MD_CTX ctx;
 
-	if(EVP_DigestInit(&ctx, digest->digest)
-			&& EVP_DigestUpdate(&ctx, indata, inlen)
-			&& EVP_DigestFinal(&ctx, outdata, NULL))
-		return true;
-	
-	logger(LOG_DEBUG, _("Error creating digest: %s"), ERR_error_string(ERR_get_error(), NULL));
-	return false;
+	if(!EVP_DigestInit(&ctx, digest->digest)
+			|| !EVP_DigestUpdate(&ctx, indata, inlen)
+			|| !EVP_DigestFinal(&ctx, tmpdata, NULL)) {
+		logger(LOG_DEBUG, "Error creating digest: %s", ERR_error_string(ERR_get_error(), NULL));
+		return false;
+	}
+
+	memcpy(outdata, tmpdata, digest->maclength);
+	return true;
 }
 
-bool digest_verify(digest_t *digest, void *indata, size_t inlen, void *cmpdata) {
+bool digest_verify(digest_t *digest, const void *indata, size_t inlen, const void *cmpdata) {
 	size_t len = EVP_MD_size(digest->digest);
-	char outdata[len];
+	unsigned char outdata[len];
 
-	return digest_create(digest, indata, inlen, outdata) && !memcmp(cmpdata, outdata, len);
+	return digest_create(digest, indata, inlen, outdata) && !memcmp(cmpdata, outdata, digest->maclength);
 }
 
 int digest_get_nid(const digest_t *digest) {
@@ -76,7 +96,7 @@ int digest_get_nid(const digest_t *digest) {
 }
 
 size_t digest_length(const digest_t *digest) {
-	return EVP_MD_size(digest->digest);
+	return digest->maclength;
 }
 
 bool digest_active(const digest_t *digest) {