]> granicus.if.org Git - apache/commitdiff
Reverting proposal again: compilation test reveals
authorRainer Jung <rjung@apache.org>
Fri, 16 Mar 2018 09:18:45 +0000 (09:18 +0000)
committerRainer Jung <rjung@apache.org>
Fri, 16 Mar 2018 09:18:45 +0000 (09:18 +0000)
that SSL_get_server_tmp_key is only OpenSSL 1.0.2+.
But it seems the whole feature doesn't make sense
without SSL_get_server_tmp_key.
For the sake of completeness: EVP_PKEY_id also isn't
part of 0.9.8a.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1826929 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 896e751bb2cbfa2575bcf790d5fb8834da9b9faf..ef45c3dcc5541379a44837963810074643b75669 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -175,20 +175,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   Merge only fails due to small docs conflicts.
      +1: rjung, ylavic,
 
-  *) ab: print Server Temp Key information.
-     Plus follow up to r1738415: EC_curve_nid2nist() only available in OpenSSL-1.0.2 and later
-     so do not use it for older OpenSSL.
-     Plus follow up to r1738415: handle any tmp key id.
-     Otherwise, we print garbage (e.g. for X25519).
-     This brings 2.4.x ab in sync with trunk.
-     trunk patches: http://svn.apache.org/r1738415
-                    http://svn.apache.org/r1741566
-                    http://svn.apache.org/r1826880
-     2.4.x patch: https://home.apache.org/~rjung/patches/httpd-2.4.x-ab-print-server-temp-key-v2.patch
-                  plus CHANGES
-     +1: rjung, ylavic
-     rjung: covener, are you still +1 with r1826880 now added (v2 patch)?
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]