Changeset 14018


Ignorieren:
Zeitstempel:
08.01.2017 23:21:05 (vor 7 Monaten)
Autor:
er13
Nachricht:

OpenSSL:

Ort:
trunk
Dateien:
1 gelöscht
3 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/CHANGELOG

    r14017 r14018  
    151151    * openconnect 7.04 
    152152    * openssh 7.4p1 
    153     * openssl 0.9.8zh/1.0.1u/1.0.2j 
     153    * openssl 0.9.8zh/1.0.2j 
    154154    * openvpn 2.3.14/2.4.0 
    155155    * pcre 8.39 
  • trunk/make/openssl/Config.in.libs

    r13798 r14018  
    4242    depends on FREETZ_OPENSSL_VERSION_PROMPT 
    4343    prompt "OpenSSL version" 
    44     default FREETZ_OPENSSL_VERSION_1 
     44    default FREETZ_OPENSSL_VERSION_1_LTS 
    4545 
    4646    config FREETZ_OPENSSL_VERSION_0 
     
    5050        - NOT supported by the OpenSSL development team anymore 
    5151          (s. https://www.openssl.org/policies/releasestrat.html) 
    52         - is smaller than 1.0.x (about 142kB) 
     52        - is smaller than 1.0.x 
    5353        - could be used (with some limitations) as a replacement for AVM's OpenSSL library 
    5454        - contains no assembler optimized code 
    55  
    56     config FREETZ_OPENSSL_VERSION_1 
    57     bool "1.0.1" 
    58     help 
    59         - is bigger than 0.9.8 (about 142kB) 
    60         - could NOT be used as a replacement for AVM's OpenSSL library 
    61         - contains assembler optimized code giving performance improvements of up to 30% 
    6255 
    6356    config FREETZ_OPENSSL_VERSION_1_LTS 
    6457    bool "1.0.2" 
    6558    help 
    66         - is the LTS (Long Term Support) version, which will be maintained until 
    67           01-01-2020 while 1.0.1 will be dropped after 12-31-2016 
     59        - is bigger than 0.9.8 
     60        - could NOT be used as a replacement for AVM's OpenSSL library 
     61        - contains assembler optimized code giving performance improvements of up to 30% 
    6862 
    6963endchoice 
     
    7367    string 
    7468    default "0.9.8" if FREETZ_OPENSSL_VERSION_0 
    75     default "1.0.0" if FREETZ_OPENSSL_VERSION_1 || FREETZ_OPENSSL_VERSION_1_LTS 
     69    default "1.0.0" if FREETZ_OPENSSL_VERSION_1_LTS 
    7670 
    7771 
  • trunk/make/openssl/openssl.mk

    r13942 r14018  
    1 $(call PKG_INIT_BIN,$(if $(FREETZ_OPENSSL_VERSION_0),0.9.8zh,$(if $(FREETZ_OPENSSL_VERSION_1_LTS),1.0.2j,1.0.1u))) 
     1$(call PKG_INIT_BIN,$(if $(FREETZ_OPENSSL_VERSION_0),0.9.8zh,1.0.2j)) 
    22$(PKG)_LIB_VERSION:=$(call qstrip,$(FREETZ_OPENSSL_SHLIB_VERSION)) 
    33$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz 
    44$(PKG)_SOURCE_SHA256_0.9.8zh := f1d9f3ed1b85a82ecf80d0e2d389e1fda3fca9a4dba0bf07adbf231e1a5e2fd6 
    5 $(PKG)_SOURCE_SHA256_1.0.1u  := 4312b4ca1215b6f2c97007503d80db80d5157f76f8f7d3febbe6b4c56ff26739 
    65$(PKG)_SOURCE_SHA256_1.0.2j  := e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 
    76$(PKG)_SOURCE_SHA256         := $($(PKG)_SOURCE_SHA256_$($(PKG)_VERSION)) 
     
    2625$(PKG)_REBUILD_SUBOPTS += FREETZ_LIB_libcrypto_WITH_RC4 
    2726$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_VERSION_0 
    28 $(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_VERSION_1 
    2927$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_VERSION_1_LTS 
    3028$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SMALL_FOOTPRINT 
     
    3735$(PKG)_OPTIONS    := shared no-err no-fips no-hw no-engines no-sse2 no-capieng no-seed 
    3836$(PKG)_OPTIONS    += $(if $(FREETZ_LIB_libcrypto_WITH_EC),,no-ec) 
    39 $(PKG)_OPTIONS    += $(if $(FREETZ_OPENSSL_VERSION_0),no-perlasm) 
    40 $(PKG)_OPTIONS    += $(if $(or $(FREETZ_OPENSSL_VERSION_0),$(FREETZ_OPENSSL_VERSION_1)),no-cms) 
    41 $(PKG)_OPTIONS    += $(if $(or $(FREETZ_OPENSSL_VERSION_1),$(FREETZ_OPENSSL_VERSION_1_LTS)),no-ec_nistp_64_gcc_128 no-sctp no-srp no-store no-whirlpool) 
     37$(PKG)_OPTIONS    += $(if $(FREETZ_OPENSSL_VERSION_0),no-perlasm no-cms) 
     38$(PKG)_OPTIONS    += $(if $(FREETZ_OPENSSL_VERSION_1_LTS),no-ec_nistp_64_gcc_128 no-sctp no-srp no-store no-whirlpool) 
    4239$(PKG)_OPTIONS    += $(if $(FREETZ_PACKAGE_OPENSSL_TRACE),enable-ssl-trace) 
    4340 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.