projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
package/mac80211: move all configuration items in submenus, merge Config.in* into...
[openwrt.git]
/
package
/
openssl
/
patches
/
200-ocf-20080917.patch
diff --git
a/package/openssl/patches/200-ocf-20080917.patch
b/package/openssl/patches/200-ocf-20080917.patch
index
92520ea
..
2c6c04a
100644
(file)
--- a/
package/openssl/patches/200-ocf-20080917.patch
+++ b/
package/openssl/patches/200-ocf-20080917.patch
@@
-9,7
+9,7
@@
#
# --test-sanity Make a number of sanity checks on the data in this file.
# This is a debugging tool for OpenSSL developers.
#
# --test-sanity Make a number of sanity checks on the data in this file.
# This is a debugging tool for OpenSSL developers.
-@@ -5
47,6 +549
,9 @@ my %table=(
+@@ -5
54,6 +556
,9 @@ my %table=(
##### Compaq Non-Stop Kernel (Tandem)
"tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::",
##### Compaq Non-Stop Kernel (Tandem)
"tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::",
@@
-19,7
+19,7
@@
);
my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
);
my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
-@@ -6
01,6 +606
,8 @@ my $montasm=1; # but "no-montasm" is d
+@@ -6
10,6 +615
,8 @@ my $montasm=1; # but "no-montasm" is d
my $no_asm=0;
my $no_dso=0;
my $no_gmp=0;
my $no_asm=0;
my $no_dso=0;
my $no_gmp=0;
@@
-28,9
+28,9
@@
my @skip=();
my $Makefile="Makefile";
my $des_locl="crypto/des/des_locl.h";
my @skip=();
my $Makefile="Makefile";
my $des_locl="crypto/des/des_locl.h";
-@@ -7
49,6 +756
,14 @@ PROCESS_ARGS:
+@@ -7
62,6 +769
,14 @@ PROCESS_ARGS:
{
{
-
exit(&test_sanity())
;
+
$strict_warnings = 1
;
}
+ elsif (/^--with-cryptodev$/)
+ {
}
+ elsif (/^--with-cryptodev$/)
+ {
@@
-43,7
+43,7
@@
elsif (/^reconfigure/ || /^reconf/)
{
if (open(IN,"<$Makefile"))
elsif (/^reconfigure/ || /^reconf/)
{
if (open(IN,"<$Makefile"))
-@@ -10
37,6 +1052
,7 @@ foreach (sort (keys %disabled))
+@@ -10
55,6 +1070
,7 @@ foreach (sort (keys %disabled))
print " OPENSSL_NO_$ALGO";
if (/^err$/) { $flags .= "-DOPENSSL_NO_ERR "; }
print " OPENSSL_NO_$ALGO";
if (/^err$/) { $flags .= "-DOPENSSL_NO_ERR "; }
@@
-51,7
+51,7
@@
elsif (/^asm$/) { $no_asm = 1; }
}
else
elsif (/^asm$/) { $no_asm = 1; }
}
else
-@@ -11
61,6 +1177
,16 @@ if (!$no_krb5)
+@@ -11
84,6 +1200
,16 @@ if (!$no_krb5)
$withargs{"krb5-dir"} ne "";
}
$withargs{"krb5-dir"} ne "";
}
@@
-85,7
+85,7
@@
----------------------
--- a/Makefile.org
+++ b/Makefile.org
----------------------
--- a/Makefile.org
+++ b/Makefile.org
-@@ -50
2,7 +502
,7 @@ files:
+@@ -50
4,7 +504
,7 @@ files:
links:
@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
links:
@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
@@
-116,7
+116,7
@@
# on Unix, "cyg" for certain forms under Cygwin...) or suffix (.a, .so,
--- a/config
+++ b/config
# on Unix, "cyg" for certain forms under Cygwin...) or suffix (.a, .so,
--- a/config
+++ b/config
-@@ -270,7 +270,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
MACHINE}" in
+@@ -270,7 +270,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
echo "ppc-apple-darwin${VERSION}"
;;
*)
echo "ppc-apple-darwin${VERSION}"
;;
*)
@@
-144,7
+144,7
@@
fi
# Only set CC if not supplied already
fi
# Only set CC if not supplied already
-@@ -4
93,6 +493
,9 @@ echo Operating system: $GUESSOS
+@@ -4
88,6 +491
,9 @@ echo Operating system: $GUESSOS
# script above so we end up with values in vars but that would take
# more time that I want to waste at the moment
case "$GUESSOS" in
# script above so we end up with values in vars but that would take
# more time that I want to waste at the moment
case "$GUESSOS" in
@@
-320,7
+320,7
@@
{FUNC_TYPE_MD,"md2",dgst_main},
--- a/apps/speed.c
+++ b/apps/speed.c
{FUNC_TYPE_MD,"md2",dgst_main},
--- a/apps/speed.c
+++ b/apps/speed.c
-@@ -29
2,7 +292
,7 @@ static const char *names[ALGOR_NUM]={
+@@ -29
6,7 +296
,7 @@ static const char *names[ALGOR_NUM]={
"evp","sha256","sha512",
"aes-128 ige","aes-192 ige","aes-256 ige"};
static double results[ALGOR_NUM][SIZE_NUM];
"evp","sha256","sha512",
"aes-128 ige","aes-192 ige","aes-256 ige"};
static double results[ALGOR_NUM][SIZE_NUM];
@@
-329,7
+329,7
@@
#ifndef OPENSSL_NO_RSA
static double rsa_results[RSA_NUM][2];
#endif
#ifndef OPENSSL_NO_RSA
static double rsa_results[RSA_NUM][2];
#endif
-@@ -3
28,6 +328
,79 @@ static SIGRETTYPE sig_done(int sig)
+@@ -3
36,6 +336
,79 @@ static SIGRETTYPE sig_done(int sig)
#define START 0
#define STOP 1
#define START 0
#define STOP 1
@@
-409,7
+409,7
@@
#if defined(OPENSSL_SYS_NETWARE)
/* for NetWare the best we can do is use clock() which returns the
#if defined(OPENSSL_SYS_NETWARE)
/* for NetWare the best we can do is use clock() which returns the
-@@ -3
58,6 +431
,11 @@ static double Time_F(int s)
+@@ -3
66,6 +439
,11 @@ static double Time_F(int s)
{
double ret;
{
double ret;
@@
-421,7
+421,7
@@
#ifdef USE_TOD
if(usertime)
{
#ifdef USE_TOD
if(usertime)
{
-@@ -8
32,6 +910
,14 @@ int MAIN(int argc, char **argv)
+@@ -8
40,6 +918
,14 @@ int MAIN(int argc, char **argv)
j--; /* Otherwise, -elapsed gets confused with
an algorithm. */
}
j--; /* Otherwise, -elapsed gets confused with
an algorithm. */
}
@@
-436,8
+436,8
@@
else if ((argc > 0) && (strcmp(*argv,"-evp") == 0))
{
argc--;
else if ((argc > 0) && (strcmp(*argv,"-evp") == 0))
{
argc--;
-@@ -126
0,6 +1346
,9 @@ int MAIN(int argc, char **argv)
- #if
def HAVE
_FORK
+@@ -126
8,6 +1354
,9 @@ int MAIN(int argc, char **argv)
+ #if
ndef NO
_FORK
BIO_printf(bio_err,"-multi n run n benchmarks in parallel.\n");
#endif
+#ifdef __linux__
BIO_printf(bio_err,"-multi n run n benchmarks in parallel.\n");
#endif
+#ifdef __linux__
@@
-446,7
+446,7
@@
goto end;
}
argc--;
goto end;
}
argc--;
-@@ -12
67,11 +1356
,6 @@ int MAIN(int argc, char **argv)
+@@ -12
75,11 +1364
,6 @@ int MAIN(int argc, char **argv)
j++;
}
j++;
}
@@
-458,7
+458,7
@@
if (j == 0)
{
for (i=0; i<ALGOR_NUM; i++)
if (j == 0)
{
for (i=0; i<ALGOR_NUM; i++)
-@@ -16
04,6 +1688
,11 @@ int MAIN(int argc, char **argv)
+@@ -16
12,6 +1696
,11 @@ int MAIN(int argc, char **argv)
signal(SIGALRM,sig_done);
#endif /* SIGALRM */
signal(SIGALRM,sig_done);
#endif /* SIGALRM */
@@
-470,7
+470,7
@@
#ifndef OPENSSL_NO_MD2
if (doit[D_MD2])
{
#ifndef OPENSSL_NO_MD2
if (doit[D_MD2])
{
-@@ -20
33,8 +2122
,6 @@ int MAIN(int argc, char **argv)
+@@ -20
41,8 +2130
,6 @@ int MAIN(int argc, char **argv)
/* -O3 -fschedule-insns messes up an
* optimization here! names[D_EVP]
* somehow becomes NULL */
/* -O3 -fschedule-insns messes up an
* optimization here! names[D_EVP]
* somehow becomes NULL */
@@
-479,7
+479,7
@@
EVP_CIPHER_CTX_init(&ctx);
if(decrypt)
EVP_CIPHER_CTX_init(&ctx);
if(decrypt)
-@@ -20
43,6 +2130
,9 @@ int MAIN(int argc, char **argv)
+@@ -20
51,6 +2138
,9 @@ int MAIN(int argc, char **argv)
EVP_EncryptInit_ex(&ctx,evp_cipher,NULL,key16,iv);
EVP_CIPHER_CTX_set_padding(&ctx, 0);
EVP_EncryptInit_ex(&ctx,evp_cipher,NULL,key16,iv);
EVP_CIPHER_CTX_set_padding(&ctx, 0);
@@
-489,7
+489,7
@@
Time_F(START);
if(decrypt)
for (count=0,run=1; COND(save_count*4*lengths[0]/lengths[j]); count++)
Time_F(START);
if(decrypt)
for (count=0,run=1; COND(save_count*4*lengths[0]/lengths[j]); count++)
-@@ -21
07,6 +2197
,8 @@ int MAIN(int argc, char **argv)
+@@ -21
15,6 +2205
,8 @@ int MAIN(int argc, char **argv)
}
}
d=Time_F(STOP);
}
}
d=Time_F(STOP);
@@
-498,7
+498,7
@@
BIO_printf(bio_err,mr ? "+R1:%ld:%d:%.2f\n"
: "%ld %d bit private RSA's in %.2fs\n",
count,rsa_bits[j],d);
BIO_printf(bio_err,mr ? "+R1:%ld:%d:%.2f\n"
: "%ld %d bit private RSA's in %.2fs\n",
count,rsa_bits[j],d);
-@@ -21
42,6 +2234
,8 @@ int MAIN(int argc, char **argv)
+@@ -21
50,6 +2242
,8 @@ int MAIN(int argc, char **argv)
}
}
d=Time_F(STOP);
}
}
d=Time_F(STOP);
@@
-507,7
+507,7
@@
BIO_printf(bio_err,mr ? "+R2:%ld:%d:%.2f\n"
: "%ld %d bit public RSA's in %.2fs\n",
count,rsa_bits[j],d);
BIO_printf(bio_err,mr ? "+R2:%ld:%d:%.2f\n"
: "%ld %d bit public RSA's in %.2fs\n",
count,rsa_bits[j],d);
-@@ -220
1,6 +2295
,8 @@ int MAIN(int argc, char **argv)
+@@ -220
9,6 +2303
,8 @@ int MAIN(int argc, char **argv)
}
}
d=Time_F(STOP);
}
}
d=Time_F(STOP);
@@
-516,7
+516,7
@@
BIO_printf(bio_err,mr ? "+R3:%ld:%d:%.2f\n"
: "%ld %d bit DSA signs in %.2fs\n",
count,dsa_bits[j],d);
BIO_printf(bio_err,mr ? "+R3:%ld:%d:%.2f\n"
: "%ld %d bit DSA signs in %.2fs\n",
count,dsa_bits[j],d);
-@@ -22
36,6 +2332
,8 @@ int MAIN(int argc, char **argv)
+@@ -22
44,6 +2340
,8 @@ int MAIN(int argc, char **argv)
}
}
d=Time_F(STOP);
}
}
d=Time_F(STOP);
@@
-525,7
+525,7
@@
BIO_printf(bio_err,mr ? "+R4:%ld:%d:%.2f\n"
: "%ld %d bit DSA verify in %.2fs\n",
count,dsa_bits[j],d);
BIO_printf(bio_err,mr ? "+R4:%ld:%d:%.2f\n"
: "%ld %d bit DSA verify in %.2fs\n",
count,dsa_bits[j],d);
-@@ -253
0,14 +2628
,23 @@ show_res:
+@@ -253
8,14 +2636
,23 @@ show_res:
fprintf(stdout,"The 'numbers' are in 1000s of bytes per second processed.\n");
fprintf(stdout,"type ");
}
fprintf(stdout,"The 'numbers' are in 1000s of bytes per second processed.\n");
fprintf(stdout,"type ");
}
@@
-550,7
+550,7
@@
if(mr)
fprintf(stdout,"+F:%d:%s",k,names[k]);
else
if(mr)
fprintf(stdout,"+F:%d:%s",k,names[k]);
else
-@@ -25
48,6 +2655
,8 @@ show_res:
+@@ -25
56,6 +2663
,8 @@ show_res:
fprintf(stdout," %11.2fk",results[k][j]/1e3);
else
fprintf(stdout,mr ? ":%.2f" : " %11.2f ",results[k][j]);
fprintf(stdout," %11.2fk",results[k][j]/1e3);
else
fprintf(stdout,mr ? ":%.2f" : " %11.2f ",results[k][j]);
@@
-559,7
+559,7
@@
}
fprintf(stdout,"\n");
}
}
fprintf(stdout,"\n");
}
-@@ -25
62,13 +2671
,18 @@ show_res:
+@@ -25
70,13 +2679
,18 @@ show_res:
j=0;
}
if(mr)
j=0;
}
if(mr)
@@
-585,7
+585,7
@@
}
#endif
#ifndef OPENSSL_NO_DSA
}
#endif
#ifndef OPENSSL_NO_DSA
-@@ -25
82,12 +2696
,18 @@ show_res:
+@@ -25
90,12 +2704
,18 @@ show_res:
j=0;
}
if(mr)
j=0;
}
if(mr)
@@
-609,7
+609,7
@@
}
#endif
#ifndef OPENSSL_NO_ECDSA
}
#endif
#ifndef OPENSSL_NO_ECDSA
-@@ -27
12,8 +2832
,10 @@ static void pkey_print_message(const cha
+@@ -27
20,8 +2840
,10 @@ static void pkey_print_message(const cha
static void print_result(int alg,int run_no,int count,double time_used)
{
static void print_result(int alg,int run_no,int count,double time_used)
{
@@
-622,7
+622,7
@@
results[alg][run_no]=((double)count)/time_used*lengths[run_no];
}
results[alg][run_no]=((double)count)/time_used*lengths[run_no];
}
-@@ -28
08,29 +2930
,11 @@ static int do_multi(int multi)
+@@ -28
16,29 +2938
,11 @@ static int do_multi(int multi)
p=buf+3;
alg=atoi(sstrsep(&p,sep));
sstrsep(&p,sep);
p=buf+3;
alg=atoi(sstrsep(&p,sep));
sstrsep(&p,sep);
@@
-655,7
+655,7
@@
}
else if(!strncmp(buf,"+F2:",4))
{
}
else if(!strncmp(buf,"+F2:",4))
{
-@@ -284
1,12 +2945
,18 @@ static int do_multi(int multi)
+@@ -284
9,12 +2953
,18 @@ static int do_multi(int multi)
k=atoi(sstrsep(&p,sep));
sstrsep(&p,sep);
k=atoi(sstrsep(&p,sep));
sstrsep(&p,sep);
@@
-674,7
+674,7
@@
d=atof(sstrsep(&p,sep));
if(n)
rsa_results[k][1]=1/(1/rsa_results[k][1]+1/d);
d=atof(sstrsep(&p,sep));
if(n)
rsa_results[k][1]=1/(1/rsa_results[k][1]+1/d);
-@@ -28
62,12 +2972
,18 @@ static int do_multi(int multi)
+@@ -28
70,12 +2980
,18 @@ static int do_multi(int multi)
k=atoi(sstrsep(&p,sep));
sstrsep(&p,sep);
k=atoi(sstrsep(&p,sep));
sstrsep(&p,sep);
@@
-726,7
+726,7
@@
if (!bsd_cryptodev_default_loaded) {
--- a/crypto/engine/eng_cryptodev.c
+++ b/crypto/engine/eng_cryptodev.c
if (!bsd_cryptodev_default_loaded) {
--- a/crypto/engine/eng_cryptodev.c
+++ b/crypto/engine/eng_cryptodev.c
-@@ -
68,6 +68
,16 @@ ENGINE_load_cryptodev(void)
+@@ -
72,6 +72
,16 @@ ENGINE_load_cryptodev(void)
struct dev_crypto_state {
struct session_op d_sess;
int d_fd;
struct dev_crypto_state {
struct session_op d_sess;
int d_fd;
@@
-743,7
+743,7
@@
};
static u_int32_t cryptodev_asymfeat = 0;
};
static u_int32_t cryptodev_asymfeat = 0;
-@@ -7
5,9 +85
,11 @@ static u_int32_t cryptodev_asymfeat = 0;
+@@ -7
9,9 +89
,11 @@ static u_int32_t cryptodev_asymfeat = 0;
static int get_asym_dev_crypto(void);
static int open_dev_crypto(void);
static int get_dev_crypto(void);
static int get_asym_dev_crypto(void);
static int open_dev_crypto(void);
static int get_dev_crypto(void);
@@
-753,9
+753,9
@@
static int cipher_nid_to_cryptodev(int nid);
+#endif
static int get_cryptodev_ciphers(const int **cnids);
static int cipher_nid_to_cryptodev(int nid);
+#endif
static int get_cryptodev_ciphers(const int **cnids);
- static int get_cryptodev_digests(const int **cnids);
+ /*static int get_cryptodev_digests(const int **cnids);*/
static int cryptodev_usable_ciphers(const int **nids);
static int cryptodev_usable_ciphers(const int **nids);
-@@ -13
0,9 +142
,12 @@ static struct {
+@@ -13
4,9 +146
,12 @@ static struct {
int ivmax;
int keylen;
} ciphers[] = {
int ivmax;
int keylen;
} ciphers[] = {
@@
-768,7
+768,7
@@
{ CRYPTO_BLF_CBC, NID_bf_cbc, 8, 16, },
{ CRYPTO_CAST_CBC, NID_cast5_cbc, 8, 16, },
{ CRYPTO_SKIPJACK_CBC, NID_undef, 0, 0, },
{ CRYPTO_BLF_CBC, NID_bf_cbc, 8, 16, },
{ CRYPTO_CAST_CBC, NID_cast5_cbc, 8, 16, },
{ CRYPTO_SKIPJACK_CBC, NID_undef, 0, 0, },
-@@ -14
2,14 +157
,15 @@ static struct {
+@@ -14
7,14 +162
,15 @@ static struct {
static struct {
int id;
int nid;
static struct {
int id;
int nid;
@@
-789,9
+789,9
@@
+ { CRYPTO_SHA1, NID_sha1, 20},
+ { 0, NID_undef, 0},
};
+ { CRYPTO_SHA1, NID_sha1, 20},
+ { 0, NID_undef, 0},
};
+ #endif
- /*
-@@ -176,10 +192,17 @@ open_dev_crypto(void)
+@@ -182,10 +198,17 @@ open_dev_crypto(void)
static int
get_dev_crypto(void)
{
static int
get_dev_crypto(void)
{
@@
-812,7
+812,7
@@
if (ioctl(fd, CRIOGET, &retfd) == -1)
return (-1);
if (ioctl(fd, CRIOGET, &retfd) == -1)
return (-1);
-@@ -20
2,6 +225
,7 @@ get_asym_dev_crypto(void)
+@@ -20
8,6 +231
,7 @@ get_asym_dev_crypto(void)
return fd;
}
return fd;
}
@@
-820,7
+820,7
@@
/*
* XXXX this needs to be set for each alg - and determined from
* a running card.
/*
* XXXX this needs to be set for each alg - and determined from
* a running card.
-@@ -2
45,6 +269
,7 @@ cipher_nid_to_cryptodev(int nid)
+@@ -2
51,6 +275
,7 @@ cipher_nid_to_cryptodev(int nid)
return (ciphers[i].id);
return (0);
}
return (ciphers[i].id);
return (0);
}
@@
-828,7
+828,7
@@
/*
* Find out what ciphers /dev/crypto will let us have a session for.
/*
* Find out what ciphers /dev/crypto will let us have a session for.
-@@ -2
64,7 +289
,7 @@ get_cryptodev_ciphers(const int **cnids)
+@@ -2
70,7 +295
,7 @@ get_cryptodev_ciphers(const int **cnids)
return (0);
}
memset(&sess, 0, sizeof(sess));
return (0);
}
memset(&sess, 0, sizeof(sess));
@@
-837,7
+837,7
@@
for (i = 0; ciphers[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
if (ciphers[i].nid == NID_undef)
for (i = 0; ciphers[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
if (ciphers[i].nid == NID_undef)
-@@ -3
03,10 +328
,12 @@ get_cryptodev_digests(const int **cnids)
+@@ -3
10,10 +335
,12 @@ get_cryptodev_digests(const int **cnids)
return (0);
}
memset(&sess, 0, sizeof(sess));
return (0);
}
memset(&sess, 0, sizeof(sess));
@@
-850,7
+850,7
@@
sess.cipher = 0;
if (ioctl(fd, CIOCGSESSION, &sess) != -1 &&
ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
sess.cipher = 0;
if (ioctl(fd, CIOCGSESSION, &sess) != -1 &&
ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
-@@ -3
51,6 +378
,9 @@ cryptodev_usable_ciphers(const int **nid
+@@ -3
60,6 +387
,9 @@ cryptodev_usable_ciphers(const int **nid
static int
cryptodev_usable_digests(const int **nids)
{
static int
cryptodev_usable_digests(const int **nids)
{
@@
-860,7
+860,7
@@
/*
* XXXX just disable all digests for now, because it sucks.
* we need a better way to decide this - i.e. I may not
/*
* XXXX just disable all digests for now, because it sucks.
* we need a better way to decide this - i.e. I may not
-@@ -3
65,6 +395
,7 @@ cryptodev_usable_digests(const int **nid
+@@ -3
74,6 +404
,7 @@ cryptodev_usable_digests(const int **nid
*/
*nids = NULL;
return (0);
*/
*nids = NULL;
return (0);
@@
-868,7
+868,7
@@
}
static int
}
static int
-@@ -4
27,16 +458
,20 @@ cryptodev_init_key(EVP_CIPHER_CTX *ctx,
+@@ -4
36,16 +467
,20 @@ cryptodev_init_key(EVP_CIPHER_CTX *ctx,
{
struct dev_crypto_state *state = ctx->cipher_data;
struct session_op *sess = &state->d_sess;
{
struct dev_crypto_state *state = ctx->cipher_data;
struct session_op *sess = &state->d_sess;
@@
-896,7
+896,7
@@
memset(sess, 0, sizeof(struct session_op));
memset(sess, 0, sizeof(struct session_op));
-@@ -
496,6 +531
,20 @@ cryptodev_cleanup(EVP_CIPHER_CTX *ctx)
+@@ -
505,6 +540
,20 @@ cryptodev_cleanup(EVP_CIPHER_CTX *ctx)
* gets called when libcrypto requests a cipher NID.
*/
* gets called when libcrypto requests a cipher NID.
*/
@@
-917,7
+917,7
@@
/* DES CBC EVP */
const EVP_CIPHER cryptodev_des_cbc = {
NID_des_cbc,
/* DES CBC EVP */
const EVP_CIPHER cryptodev_des_cbc = {
NID_des_cbc,
-@@ -5
63,6 +612
,32 @@ const EVP_CIPHER cryptodev_aes_cbc = {
+@@ -5
72,6 +621
,32 @@ const EVP_CIPHER cryptodev_aes_cbc = {
NULL
};
NULL
};
@@
-950,7
+950,7
@@
/*
* Registered by the ENGINE when used to find out how to deal with
* a particular NID in the ENGINE. this says what we'll do at the
/*
* Registered by the ENGINE when used to find out how to deal with
* a particular NID in the ENGINE. this says what we'll do at the
-@@ -5
76,6 +651
,9 @@ cryptodev_engine_ciphers(ENGINE *e, cons
+@@ -5
85,6 +660
,9 @@ cryptodev_engine_ciphers(ENGINE *e, cons
return (cryptodev_usable_ciphers(nids));
switch (nid) {
return (cryptodev_usable_ciphers(nids));
switch (nid) {
@@
-960,7
+960,7
@@
case NID_des_ede3_cbc:
*cipher = &cryptodev_3des_cbc;
break;
case NID_des_ede3_cbc:
*cipher = &cryptodev_3des_cbc;
break;
-@@ -
591,6 +669
,12 @@ cryptodev_engine_ciphers(ENGINE *e, cons
+@@ -
600,6 +678
,12 @@ cryptodev_engine_ciphers(ENGINE *e, cons
case NID_aes_128_cbc:
*cipher = &cryptodev_aes_cbc;
break;
case NID_aes_128_cbc:
*cipher = &cryptodev_aes_cbc;
break;
@@
-973,7
+973,7
@@
default:
*cipher = NULL;
break;
default:
*cipher = NULL;
break;
-@@ -
598,6 +682
,234 @@ cryptodev_engine_ciphers(ENGINE *e, cons
+@@ -
607,6 +691
,234 @@ cryptodev_engine_ciphers(ENGINE *e, cons
return (*cipher != NULL);
}
return (*cipher != NULL);
}
@@
-1208,7
+1208,7
@@
static int
cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
const int **nids, int nid)
static int
cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
const int **nids, int nid)
-@@ -6
06,10 +918
,15 @@ cryptodev_engine_digests(ENGINE *e, cons
+@@ -6
15,10 +927
,15 @@ cryptodev_engine_digests(ENGINE *e, cons
return (cryptodev_usable_digests(nids));
switch (nid) {
return (cryptodev_usable_digests(nids));
switch (nid) {
@@
-1225,15
+1225,15
@@
*digest = NULL;
break;
}
*digest = NULL;
break;
}
-@@ -6
37,6 +954
,7 @@ bn2crparam(const BIGNUM *a, struct crpar
+@@ -6
46,6 +963
,7 @@ bn2crparam(const BIGNUM *a, struct crpar
b = malloc(bytes);
if (b == NULL)
return (1);
+ memset(b, 0, bytes);
b = malloc(bytes);
if (b == NULL)
return (1);
+ memset(b, 0, bytes);
- crp->crp_p = b;
+ crp->crp_p =
(char *)
b;
crp->crp_nbits = bits;
crp->crp_nbits = bits;
-@@ -6
81,7 +999
,7 @@ zapparams(struct crypt_kop *kop)
+@@ -6
90,7 +1008
,7 @@ zapparams(struct crypt_kop *kop)
{
int i;
{
int i;
@@
-1244,7
+1244,7
@@
kop->crk_param[i].crp_p = NULL;
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
kop->crk_param[i].crp_p = NULL;
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
-@@ -70
3,7 +703
,7 @@ typedef int (*dynamic_bind_engine)(ENGIN
+@@ -70
5,7 +705
,7 @@ typedef int (*dynamic_bind_engine)(ENGIN
* values. */
void *ENGINE_get_static_state(void);
* values. */
void *ENGINE_get_static_state(void);
@@
-1266,7
+1266,7
@@
#endif
--- a/crypto/evp/c_alld.c
+++ b/crypto/evp/c_alld.c
#endif
--- a/crypto/evp/c_alld.c
+++ b/crypto/evp/c_alld.c
-@@ -
81,7 +81
,7 @@ void OpenSSL_add_all_digests(void)
+@@ -
78,7 +78
,7 @@ void OpenSSL_add_all_digests(void)
EVP_add_digest(EVP_dss());
#endif
#endif
EVP_add_digest(EVP_dss());
#endif
#endif
@@
-1277,7
+1277,7
@@
EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);
--- a/engines/Makefile
+++ b/engines/Makefile
EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);
--- a/engines/Makefile
+++ b/engines/Makefile
-@@ -9
6,6 +96
,7 @@ install:
+@@ -9
7,6 +97
,7 @@ install:
( echo installing $$l; \
if [ "$(PLATFORM)" != "Cygwin" ]; then \
case "$(CFLAGS)" in \
( echo installing $$l; \
if [ "$(PLATFORM)" != "Cygwin" ]; then \
case "$(CFLAGS)" in \
@@
-1287,7
+1287,7
@@
*) sfx="bad";; \
--- a/util/domd
+++ b/util/domd
*) sfx="bad";; \
--- a/util/domd
+++ b/util/domd
-@@ -2
3,13 +23,17 @@ if [ "$D" = "gcc" ]; then
+@@ -2
2,13 +22,17 @@ if expr "$MAKEDEPEND" : '.*gcc$' > /dev/
done
sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp
echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
done
sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp
echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
This page took
0.038869 seconds
and
4
git commands to generate.
projects / openwrt.git / blobdiff