[Python-checkins] r41947 - python/trunk/Modules/_hashopenssl.c

[neal.norwitz]

Author: neal.norwitz
Date: Sat Jan  7 22:20:24 2006
New Revision: 41947

Modified:
   python/trunk/Modules/_hashopenssl.c
Log:
Fix icc warnings: extra semi-colon and signed vs unsigned

Modified: python/trunk/Modules/_hashopenssl.c
==============================================================================
--- python/trunk/Modules/_hashopenssl.c	(original)
+++ python/trunk/Modules/_hashopenssl.c	Sat Jan  7 22:20:24 2006
@@ -33,12 +33,12 @@
     static EVP_MD_CTX CONST_new_ ## Name ## _ctx; \
     static EVP_MD_CTX *CONST_new_ ## Name ## _ctx_p = NULL;
 
-DEFINE_CONSTS_FOR_NEW(md5);
-DEFINE_CONSTS_FOR_NEW(sha1);
-DEFINE_CONSTS_FOR_NEW(sha224);
-DEFINE_CONSTS_FOR_NEW(sha256);
-DEFINE_CONSTS_FOR_NEW(sha384);
-DEFINE_CONSTS_FOR_NEW(sha512);
+DEFINE_CONSTS_FOR_NEW(md5)
+DEFINE_CONSTS_FOR_NEW(sha1)
+DEFINE_CONSTS_FOR_NEW(sha224)
+DEFINE_CONSTS_FOR_NEW(sha256)
+DEFINE_CONSTS_FOR_NEW(sha384)
+DEFINE_CONSTS_FOR_NEW(sha512)
 
 
 static EVPobject *
@@ -101,7 +101,7 @@
 
     EVP_MD_CTX_copy(&temp_ctx, &self->ctx);
     digest_size = EVP_MD_CTX_size(&temp_ctx);
-    EVP_DigestFinal(&temp_ctx, (char *)digest, NULL);
+    EVP_DigestFinal(&temp_ctx, digest, NULL);
 
     retval = PyString_FromStringAndSize((const char *)digest, digest_size);
     EVP_MD_CTX_cleanup(&temp_ctx);
@@ -329,7 +329,7 @@
 static PyObject *
 EVPnew(PyObject *name_obj,
        const EVP_MD *digest, const EVP_MD_CTX *initial_ctx,
-       const char *cp, unsigned int len)
+       const unsigned char *cp, unsigned int len)
 {
     EVPobject *self;