diff options
| author | Steven Barth <steven@midlink.org> | 2014-06-01 09:49:24 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2014-06-01 09:49:24 +0000 |
| commit | 37283acb8406c861acbb7b27ebe3a9ecf65cedf7 (patch) | |
| tree | d5cad32f8646b319b40fb800c19a01509bd3f28e /package/libs/polarssl/patches/210-gen_key_config_fix.patch | |
| parent | 0fab8e45b6cf13568ad666c4c098bb5c12ac8877 (diff) | |
| download | master-187ad058-37283acb8406c861acbb7b27ebe3a9ecf65cedf7.tar.gz master-187ad058-37283acb8406c861acbb7b27ebe3a9ecf65cedf7.tar.bz2 master-187ad058-37283acb8406c861acbb7b27ebe3a9ecf65cedf7.zip | |
polarssl: bump to 1.3.7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40892 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libs/polarssl/patches/210-gen_key_config_fix.patch')
| -rw-r--r-- | package/libs/polarssl/patches/210-gen_key_config_fix.patch | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/package/libs/polarssl/patches/210-gen_key_config_fix.patch b/package/libs/polarssl/patches/210-gen_key_config_fix.patch index d682e28d83..77e51b8384 100644 --- a/package/libs/polarssl/patches/210-gen_key_config_fix.patch +++ b/package/libs/polarssl/patches/210-gen_key_config_fix.patch @@ -1,6 +1,8 @@ ---- a/programs/pkey/gen_key.c -+++ b/programs/pkey/gen_key.c -@@ -155,7 +155,9 @@ int main( int argc, char *argv[] ) +Index: polarssl-1.3.7/programs/pkey/gen_key.c +=================================================================== +--- polarssl-1.3.7.orig/programs/pkey/gen_key.c 2014-06-01 11:46:58.917399668 +0200 ++++ polarssl-1.3.7/programs/pkey/gen_key.c 2014-06-01 11:48:18.653397400 +0200 +@@ -215,7 +215,9 @@ opt.type = DFL_TYPE; opt.rsa_keysize = DFL_RSA_KEYSIZE; @@ -9,19 +11,19 @@ +#endif opt.filename = DFL_FILENAME; opt.format = DFL_FORMAT; - -@@ -170,8 +172,10 @@ int main( int argc, char *argv[] ) + opt.use_dev_random = DFL_USE_DEV_RANDOM; +@@ -231,8 +233,10 @@ { if( strcmp( q, "rsa" ) == 0 ) opt.type = POLARSSL_PK_RSA; +#if defined(POLARSSL_ECP_C) - if( strcmp( q, "ec" ) == 0 ) + else if( strcmp( q, "ec" ) == 0 ) opt.type = POLARSSL_PK_ECKEY; +#endif else goto usage; } -@@ -190,12 +194,14 @@ int main( int argc, char *argv[] ) +@@ -251,12 +255,14 @@ if( opt.rsa_keysize < 1024 || opt.rsa_keysize > 8192 ) goto usage; } @@ -35,4 +37,4 @@ +#endif else if( strcmp( p, "filename" ) == 0 ) opt.filename = q; - else + else if( strcmp( p, "use_dev_random" ) == 0 ) |