aboutsummaryrefslogtreecommitdiffstats
path: root/package/libs/polarssl/patches/210-gen_key_config_fix.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-03-14 15:05:46 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-03-14 15:05:46 +0000
commitc8457cf43a0e80d0e7d3af633418da5cce1444d5 (patch)
tree3fd30cc54cebacee3dfbc48269f0e318a05d0d80 /package/libs/polarssl/patches/210-gen_key_config_fix.patch
parent92007525b8c5956923c62c4fe0da339f172ace7e (diff)
downloadupstream-c8457cf43a0e80d0e7d3af633418da5cce1444d5.tar.gz
upstream-c8457cf43a0e80d0e7d3af633418da5cce1444d5.tar.bz2
upstream-c8457cf43a0e80d0e7d3af633418da5cce1444d5.zip
polarssl: update to version 1.3.4 and add openssl compat patch
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39930 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.patch38
1 files changed, 38 insertions, 0 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
new file mode 100644
index 0000000000..d682e28d83
--- /dev/null
+++ b/package/libs/polarssl/patches/210-gen_key_config_fix.patch
@@ -0,0 +1,38 @@
+--- a/programs/pkey/gen_key.c
++++ b/programs/pkey/gen_key.c
+@@ -155,7 +155,9 @@ int main( int argc, char *argv[] )
+
+ opt.type = DFL_TYPE;
+ opt.rsa_keysize = DFL_RSA_KEYSIZE;
++#if defined(POLARSSL_ECP_C)
+ opt.ec_curve = DFL_EC_CURVE;
++#endif
+ opt.filename = DFL_FILENAME;
+ opt.format = DFL_FORMAT;
+
+@@ -170,8 +172,10 @@ int main( int argc, char *argv[] )
+ {
+ if( strcmp( q, "rsa" ) == 0 )
+ opt.type = POLARSSL_PK_RSA;
++#if defined(POLARSSL_ECP_C)
+ if( strcmp( q, "ec" ) == 0 )
+ opt.type = POLARSSL_PK_ECKEY;
++#endif
+ else
+ goto usage;
+ }
+@@ -190,12 +194,14 @@ int main( int argc, char *argv[] )
+ if( opt.rsa_keysize < 1024 || opt.rsa_keysize > 8192 )
+ goto usage;
+ }
++#if defined(POLARSSL_ECP_C)
+ else if( strcmp( p, "ec_curve" ) == 0 )
+ {
+ if( ( curve_info = ecp_curve_info_from_name( q ) ) == NULL )
+ goto usage;
+ opt.ec_curve = curve_info->grp_id;
+ }
++#endif
+ else if( strcmp( p, "filename" ) == 0 )
+ opt.filename = q;
+ else