You are awesome! I'll test is tomorrow. On 27 Mar 2013 01:58, "Jiri Slachta" <slac...@cesnet.cz> wrote:
> Hello Valent, > > those engine libraries are not installed because of /install macro of > openssl package. I've prepared a small unofficial patch for you, it's a > package libopenssl-engines. If it should be official, I suppose it should > be rewritten a little into separate engine packages. > > You can grab my patch by URL below: > http://suzelly.opf.slu.cz/~sla463/openssl.diff > > or here's the diff for openssl package to be applied from the root of > openwrt src directory. I hope that patchwork skips this patch. > > ~ Jiri Slachta > > Index: package/libs/openssl/patches/140-makefile-dirs.patch > =================================================================== > --- package/libs/openssl/patches/140-makefile-dirs.patch (revision > 36132) > +++ package/libs/openssl/patches/140-makefile-dirs.patch (working > copy) > @@ -5,7 +5,7 @@ > BASEADDR= > > -DIRS= crypto ssl engines apps test tools > -+DIRS= crypto ssl apps > ++DIRS= crypto ssl engines apps > ENGDIRS= ccgost > SHLIBDIRS= crypto ssl > > Index: package/libs/openssl/patches/150-no_engines.patch > =================================================================== > --- package/libs/openssl/patches/150-no_engines.patch (revision 36132) > +++ package/libs/openssl/patches/150-no_engines.patch (working copy) > @@ -1,81 +0,0 @@ > ---- a/Configure > -+++ b/Configure > -@@ -2003,6 +2003,11 @@ EOF > - close(OUT); > - } > - > -+# ugly hack to disable engines > -+if($target eq "mingwx") { > -+ system("sed -e s/^LIB/XLIB/g -i engines/Makefile"); > -+} > -+ > - print <<EOF; > - > - Configured for $target. > ---- a/util/libeay.num > -+++ b/util/libeay.num > -@@ -2071,7 +2071,6 @@ PKCS7_ATTR_SIGN_it > - UI_add_error_string 2633 EXIST::FUNCTION: > - KRB5_CHECKSUM_free 2634 EXIST::FUNCTION: > - OCSP_REQUEST_get_ext 2635 EXIST::FUNCTION: > --ENGINE_load_ubsec 2636 > EXIST::FUNCTION:ENGINE,STATIC_ENGINE > - ENGINE_register_all_digests 2637 EXIST::FUNCTION:ENGINE > - PKEY_USAGE_PERIOD_it 2638 > EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: > - PKEY_USAGE_PERIOD_it 2638 > EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: > -@@ -2545,7 +2544,6 @@ OCSP_RESPONSE_new > - AES_set_encrypt_key 3024 EXIST::FUNCTION:AES > - OCSP_resp_count 3025 EXIST::FUNCTION: > - KRB5_CHECKSUM_new 3026 EXIST::FUNCTION: > --ENGINE_load_cswift 3027 > EXIST::FUNCTION:ENGINE,STATIC_ENGINE > - OCSP_onereq_get0_id 3028 EXIST::FUNCTION: > - ENGINE_set_default_ciphers 3029 EXIST::FUNCTION:ENGINE > - NOTICEREF_it 3030 > EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: > -@@ -2576,7 +2574,6 @@ ASN1_primitive_free > - i2d_EXTENDED_KEY_USAGE 3052 EXIST::FUNCTION: > - i2d_OCSP_SIGNATURE 3053 EXIST::FUNCTION: > - asn1_enc_save 3054 EXIST::FUNCTION: > --ENGINE_load_nuron 3055 > EXIST::FUNCTION:ENGINE,STATIC_ENGINE > - _ossl_old_des_pcbc_encrypt 3056 EXIST::FUNCTION:DES > - PKCS12_MAC_DATA_it 3057 > EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: > - PKCS12_MAC_DATA_it 3057 > EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: > -@@ -2600,7 +2597,6 @@ asn1_get_choice_selector > - i2d_KRB5_CHECKSUM 3072 EXIST::FUNCTION: > - ENGINE_set_table_flags 3073 EXIST::FUNCTION:ENGINE > - AES_options 3074 EXIST::FUNCTION:AES > --ENGINE_load_chil 3075 > EXIST::FUNCTION:ENGINE,STATIC_ENGINE > - OCSP_id_cmp 3076 EXIST::FUNCTION: > - OCSP_BASICRESP_new 3077 EXIST::FUNCTION: > - OCSP_REQUEST_get_ext_by_NID 3078 EXIST::FUNCTION: > -@@ -2667,7 +2663,6 @@ OCSP_CRLID_it > - OCSP_CRLID_it 3127 > EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: > - i2d_KRB5_AUTHENTBODY 3128 EXIST::FUNCTION: > - OCSP_REQUEST_get_ext_count 3129 EXIST::FUNCTION: > --ENGINE_load_atalla 3130 > EXIST::FUNCTION:ENGINE,STATIC_ENGINE > - X509_NAME_it 3131 > EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: > - X509_NAME_it 3131 > EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: > - USERNOTICE_it 3132 > EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: > -@@ -2762,8 +2757,6 @@ DES_read_2passwords > - DES_read_password 3207 EXIST::FUNCTION:DES > - UI_UTIL_read_pw 3208 EXIST::FUNCTION: > - UI_UTIL_read_pw_string 3209 EXIST::FUNCTION: > --ENGINE_load_aep 3210 > EXIST::FUNCTION:ENGINE,STATIC_ENGINE > --ENGINE_load_sureware 3211 > EXIST::FUNCTION:ENGINE,STATIC_ENGINE > - OPENSSL_add_all_algorithms_noconf 3212 EXIST:!VMS:FUNCTION: > - OPENSSL_add_all_algo_noconf 3212 EXIST:VMS:FUNCTION: > - OPENSSL_add_all_algorithms_conf 3213 EXIST:!VMS:FUNCTION: > -@@ -2772,7 +2765,6 @@ OPENSSL_load_builtin_modules > - AES_ofb128_encrypt 3215 EXIST::FUNCTION:AES > - AES_ctr128_encrypt 3216 EXIST::FUNCTION:AES > - AES_cfb128_encrypt 3217 EXIST::FUNCTION:AES > --ENGINE_load_4758cca 3218 > EXIST::FUNCTION:ENGINE,STATIC_ENGINE > - _ossl_096_des_random_seed 3219 EXIST::FUNCTION:DES > - EVP_aes_256_ofb 3220 EXIST::FUNCTION:AES > - EVP_aes_192_ofb 3221 EXIST::FUNCTION:AES > -@@ -3107,7 +3099,6 @@ EC_GFp_nist_method > - STORE_meth_set_modify_fn 3530 NOEXIST::FUNCTION: > - STORE_method_set_modify_function 3530 NOEXIST::FUNCTION: > - STORE_parse_attrs_next 3531 NOEXIST::FUNCTION: > --ENGINE_load_padlock 3532 > EXIST::FUNCTION:ENGINE,STATIC_ENGINE > - EC_GROUP_set_curve_name 3533 EXIST::FUNCTION:EC > - X509_CERT_PAIR_it 3534 > EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: > - X509_CERT_PAIR_it 3534 > EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: > Index: package/libs/openssl/Makefile > =================================================================== > --- package/libs/openssl/Makefile (revision 36132) > +++ package/libs/openssl/Makefile (working copy) > @@ -72,7 +72,20 @@ > This package contains the OpenSSL command-line utility. > endef > > +define Package/libopenssl-engines > + $(call Package/openssl/Default) > + SECTION:=libs > + SUBMENU:=SSL > + CATEGORY:=Libraries > + DEPENDS:=+libopenssl > + TITLE+= (engines) > +endef > > +define Package/libopenssl-engines/description > +$(call Package/openssl/Default/description) > +This package contains the OpenSSL engine libraries. > +endef > + > OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-smime \ > no-rmd160 no-aes192 no-ripemd no-camellia no-ans1 no-krb5 > OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic > no-sse2 > @@ -166,6 +179,11 @@ > $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libssl.so.* > $(1)/usr/lib/ > endef > > +define Package/libopenssl-engines/install > + $(INSTALL_DIR) $(1)/usr/lib/engines > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/engines/* > $(1)/usr/lib/engines > +endef > + > define Package/openssl-util/install > $(INSTALL_DIR) $(1)/etc/ssl > $(CP) $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(1)/etc/ssl/ > @@ -177,4 +195,5 @@ > endef > > $(eval $(call BuildPackage,libopenssl)) > +$(eval $(call BuildPackage,libopenssl-engines)) > $(eval $(call BuildPackage,openssl-util)) > > Dne 26.3.2013 22:37, valent.turko...@gmail.com napsal(a): > > Who is responsible openssl patches? I can't get openssl engines to be > > included in final openwrt image, libraries for engines get compiled > > but not copied into final image... > > > > I used menuconfig (libs>SSL>openssl stuff) to include engines etc. > > your .config should have these parameters set: > > CONFIG_PACKAGE_libopenssl=y > > CONFIG_OPENSSL_ENGINE_CRYPTO=y > > CONFIG_OPENSSL_ENGINE_DIGEST=y > > > > And then there is a manual step needed : > > > > edit package/libs/openssl/patches/140-makefile-dirs.patch to include > > building the engines > > > > # cat package/libs/openssl/patches/140-makefile-dirs.patch > > --- a/Makefile.org > > +++ b/Makefile.org > > @@ -135,7 +135,7 @@ FIPSCANLIB= > > > > BASEADDR= > > > > -DIRS= crypto ssl engines apps test tools > > +DIRS= crypto ssl engines apps > > ENGDIRS= ccgost > > SHLIBDIRS= crypto ssl > > > > ### > > > > and remove package/libs/openssl/patches/150-no_engines.patch > > > > But still don't get engines to be included into final openwrt image... > > _______________________________________________ > > openwrt-devel mailing list > > openwrt-devel@lists.openwrt.org > > https://lists.openwrt.org/mailman/listinfo/openwrt-devel > > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel >
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
