aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-connectivity/ppp
diff options
context:
space:
mode:
authorAwais Belal <awais_belal@mentor.com>2018-10-16 18:53:19 +0500
committerAwais Belal <awais_belal@mentor.com>2018-10-16 18:53:19 +0500
commit3ac99f0b40c7806a0089f49fd970a2ccf04ce65e (patch)
tree72d63cf1b86f6d5321781269f0d8dfa0988894aa /common/recipes-connectivity/ppp
parent6a3bfb63633cc2b3d9f2cddececd70bacdaf9ead (diff)
downloadmeta-amd-3ac99f0b40c7806a0089f49fd970a2ccf04ce65e.tar.gz
meta-amd-3ac99f0b40c7806a0089f49fd970a2ccf04ce65e.tar.bz2
meta-amd-3ac99f0b40c7806a0089f49fd970a2ccf04ce65e.zip
ppp: fix build with glibc 2.28+
This modifies ppp to use openssl for crypt in order to fix build with glibc 2.28+ otherwise many different failures are seen. Signed-off-by: Awais Belal <awais_belal@mentor.com>
Diffstat (limited to 'common/recipes-connectivity/ppp')
-rw-r--r--common/recipes-connectivity/ppp/files/ppp-2.4.7-DES-openssl.patch84
-rw-r--r--common/recipes-connectivity/ppp/ppp_2.4.7.bbappend4
2 files changed, 88 insertions, 0 deletions
diff --git a/common/recipes-connectivity/ppp/files/ppp-2.4.7-DES-openssl.patch b/common/recipes-connectivity/ppp/files/ppp-2.4.7-DES-openssl.patch
new file mode 100644
index 00000000..e53f2405
--- /dev/null
+++ b/common/recipes-connectivity/ppp/files/ppp-2.4.7-DES-openssl.patch
@@ -0,0 +1,84 @@
+Used openssl for the DES instead of the libcrypt / glibc
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: ppp-2.4.7/pppd/Makefile.linux
+===================================================================
+--- ppp-2.4.7.orig/pppd/Makefile.linux
++++ ppp-2.4.7/pppd/Makefile.linux
+@@ -38,7 +38,7 @@ LIBS =
+ # Uncomment the next 2 lines to include support for Microsoft's
+ # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux.
+ CHAPMS=y
+-USE_CRYPT=y
++#USE_CRYPT=y
+ # Don't use MSLANMAN unless you really know what you're doing.
+ #MSLANMAN=y
+ # Uncomment the next line to include support for MPPE. CHAPMS (above) must
+@@ -132,7 +132,7 @@ endif
+
+ ifdef NEEDDES
+ ifndef USE_CRYPT
+-LIBS += -ldes $(LIBS)
++LIBS += -lcrypto
+ else
+ CFLAGS += -DUSE_CRYPT=1
+ endif
+Index: ppp-2.4.7/pppd/pppcrypt.c
+===================================================================
+--- ppp-2.4.7.orig/pppd/pppcrypt.c
++++ ppp-2.4.7/pppd/pppcrypt.c
+@@ -64,7 +64,7 @@ u_char *des_key; /* OUT 64 bit DES key w
+ des_key[7] = Get7Bits(key, 49);
+
+ #ifndef USE_CRYPT
+- des_set_odd_parity((des_cblock *)des_key);
++ DES_set_odd_parity((DES_cblock *)des_key);
+ #endif
+ }
+
+@@ -158,25 +158,25 @@ u_char *clear; /* OUT 8 octets */
+ }
+
+ #else /* USE_CRYPT */
+-static des_key_schedule key_schedule;
++static DES_key_schedule key_schedule;
+
+ bool
+ DesSetkey(key)
+ u_char *key;
+ {
+- des_cblock des_key;
++ DES_cblock des_key;
+ MakeKey(key, des_key);
+- des_set_key(&des_key, key_schedule);
++ DES_set_key(&des_key, &key_schedule);
+ return (1);
+ }
+
+ bool
+-DesEncrypt(clear, key, cipher)
++DesEncrypt(clear, cipher)
+ u_char *clear; /* IN 8 octets */
+ u_char *cipher; /* OUT 8 octets */
+ {
+- des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher,
+- key_schedule, 1);
++ DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher,
++ &key_schedule, 1);
+ return (1);
+ }
+
+@@ -185,8 +185,8 @@ DesDecrypt(cipher, clear)
+ u_char *cipher; /* IN 8 octets */
+ u_char *clear; /* OUT 8 octets */
+ {
+- des_ecb_encrypt((des_cblock *)cipher, (des_cblock *)clear,
+- key_schedule, 0);
++ DES_ecb_encrypt((DES_cblock *)cipher, (DES_cblock *)clear,
++ &key_schedule, 0);
+ return (1);
+ }
+
diff --git a/common/recipes-connectivity/ppp/ppp_2.4.7.bbappend b/common/recipes-connectivity/ppp/ppp_2.4.7.bbappend
new file mode 100644
index 00000000..53356d8a
--- /dev/null
+++ b/common/recipes-connectivity/ppp/ppp_2.4.7.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+DEPENDS_append_mel-lite = " openssl"
+SRC_URI_append_mel-lite = " file://ppp-2.4.7-DES-openssl.patch"
+EXTRA_OEMAKE_append_mel-lite = ' COPTS="${CFLAGS} -I${STAGING_INCDIR}/openssl -I${S}/include"'