You are viewing a plain text version of this content. The canonical link for it is here.
Posted to juice-svn@xml.apache.org by bl...@apache.org on 2006/02/19 01:04:07 UTC
svn commit: r378799 - in /incubator/juice/native/srcNew: InitializeOpenSSL.c
JCEBlockCipherOpenSSL.c JCERSACipherOpenSSL.c JDKMessageDigestOpenSSL.c
Author: blautenb
Date: Sat Feb 18 16:04:05 2006
New Revision: 378799
URL: http://svn.apache.org/viewcvs?rev=378799&view=rev
Log:
Clean compile with no warnings under VC6.0
Modified:
incubator/juice/native/srcNew/InitializeOpenSSL.c
incubator/juice/native/srcNew/JCEBlockCipherOpenSSL.c
incubator/juice/native/srcNew/JCERSACipherOpenSSL.c
incubator/juice/native/srcNew/JDKMessageDigestOpenSSL.c
Modified: incubator/juice/native/srcNew/InitializeOpenSSL.c
URL: http://svn.apache.org/viewcvs/incubator/juice/native/srcNew/InitializeOpenSSL.c?rev=378799&r1=378798&r2=378799&view=diff
==============================================================================
--- incubator/juice/native/srcNew/InitializeOpenSSL.c (original)
+++ incubator/juice/native/srcNew/InitializeOpenSSL.c Sat Feb 18 16:04:05 2006
@@ -40,7 +40,7 @@
static void thread_setup(void);
static void thread_cleanup(void);
-static void my_locking_callback(int, int, char *, int);
+static void my_locking_callback(int, int, const char *, int);
/*
* Class: org_apache_security_juice_provider_InitializeOpenSSL
@@ -71,7 +71,7 @@
lock_cs[i]=CreateMutex(NULL,FALSE,NULL);
}
- CRYPTO_set_locking_callback((void (*)(int,int,char *,int))my_locking_callback);
+ CRYPTO_set_locking_callback((void (*)(int,int,const char *,int))my_locking_callback);
/* id callback defined */
}
@@ -85,7 +85,7 @@
OPENSSL_free(lock_cs);
}
-static void my_locking_callback(int mode, int type, char *file, int line)
+static void my_locking_callback(int mode, int type, const char *file, int line)
{
if (mode & CRYPTO_LOCK)
{
@@ -119,7 +119,7 @@
}
// CRYPTO_set_id_callback((unsigned long (*)())solaris_thread_id);
- CRYPTO_set_locking_callback((void (*)(int,int,char *,int))my_locking_callback);
+ CRYPTO_set_locking_callback((void (*)(int,int,const char *,int))my_locking_callback);
}
static void thread_cleanup(void)
@@ -143,7 +143,7 @@
}
-static void my_locking_callback(int mode, int type, char *file, int line)
+static void my_locking_callback(int mode, int type, const char *file, int line)
{
#ifdef undef
fprintf(stderr,"thread=%4d mode=%s lock=%s %s:%d\n",
@@ -218,7 +218,7 @@
fprintf(stderr,"done cleanup\n");
}
-static void my_locking_callback(int mode, int type, char *file,
+static void my_locking_callback(int mode, int type, const char *file,
int line)
{
#ifdef undef
Modified: incubator/juice/native/srcNew/JCEBlockCipherOpenSSL.c
URL: http://svn.apache.org/viewcvs/incubator/juice/native/srcNew/JCEBlockCipherOpenSSL.c?rev=378799&r1=378798&r2=378799&view=diff
==============================================================================
--- incubator/juice/native/srcNew/JCEBlockCipherOpenSSL.c (original)
+++ incubator/juice/native/srcNew/JCEBlockCipherOpenSSL.c Sat Feb 18 16:04:05 2006
@@ -23,7 +23,12 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
+#endif
+
+/* Definitions for specialised final functions that use 10126 padding */
+
+int EVP_EncryptFinal_ex_ISO10126(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
+int EVP_DecryptFinal_ex_ISO10126(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
void hexdump1(FILE *f,const char *title,const unsigned char *s,int l) {
int n=0;
Modified: incubator/juice/native/srcNew/JCERSACipherOpenSSL.c
URL: http://svn.apache.org/viewcvs/incubator/juice/native/srcNew/JCERSACipherOpenSSL.c?rev=378799&r1=378798&r2=378799&view=diff
==============================================================================
--- incubator/juice/native/srcNew/JCERSACipherOpenSSL.c (original)
+++ incubator/juice/native/srcNew/JCERSACipherOpenSSL.c Sat Feb 18 16:04:05 2006
@@ -18,6 +18,7 @@
#include <openssl/evp.h>
#include <openssl/rsa.h>
#include <openssl/bn.h>
+#include <openssl/err.h>
#include <jni.h>
#include "org_apache_security_juice_provider_JCERSACipherOpenSSL.h"
Modified: incubator/juice/native/srcNew/JDKMessageDigestOpenSSL.c
URL: http://svn.apache.org/viewcvs/incubator/juice/native/srcNew/JDKMessageDigestOpenSSL.c?rev=378799&r1=378798&r2=378799&view=diff
==============================================================================
--- incubator/juice/native/srcNew/JDKMessageDigestOpenSSL.c (original)
+++ incubator/juice/native/srcNew/JDKMessageDigestOpenSSL.c Sat Feb 18 16:04:05 2006
@@ -16,6 +16,7 @@
#include <stdio.h>
#include <openssl/evp.h>
+#include <openssl/err.h>
#include <jni.h>
#include "org_apache_security_juice_provider_JDKMessageDigestOpenSSL.h"
---------------------------------------------------------------------
To unsubscribe, e-mail: juice-svn-unsubscribe@xml.apache.org
For additional commands, e-mail: juice-svn-help@xml.apache.org