patch-packages_ssl_ssl4pl_c 1.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. $OpenBSD: patch-packages_ssl_ssl4pl_c,v 1.3 2014/04/24 21:52:20 edd Exp $
  2. Fallout from OpenSSL rampage.
  3. --- packages/ssl/ssl4pl.c.orig Tue Jan 21 14:47:42 2014
  4. +++ packages/ssl/ssl4pl.c Thu Apr 24 11:16:54 2014
  5. @@ -67,7 +67,9 @@ static functor_t FUNCTOR_equals2;
  6. static functor_t FUNCTOR_crl1;
  7. static functor_t FUNCTOR_revocations1;
  8. static functor_t FUNCTOR_revoked2;
  9. +#ifndef __OpenBSD__
  10. static functor_t FUNCTOR_session_key1;
  11. +#endif
  12. static functor_t FUNCTOR_master_key1;
  13. static functor_t FUNCTOR_session_id1;
  14. static functor_t FUNCTOR_client_random1;
  15. @@ -1529,10 +1531,12 @@ pl_ssl_session(term_t stream_t, term_t session_t)
  16. if ( !PL_unify_list_ex(list_t, node_t, list_t) )
  17. return FALSE;
  18. +#ifndef __OpenBSD__
  19. if ( !PL_unify_term(node_t,
  20. PL_FUNCTOR, FUNCTOR_session_key1,
  21. PL_NCHARS, session->key_arg_length, session->key_arg))
  22. return FALSE;
  23. +#endif
  24. if ( !PL_unify_list_ex(list_t, node_t, list_t))
  25. return FALSE;
  26. @@ -1614,7 +1618,9 @@ install_ssl4pl()
  27. FUNCTOR_crl1 = PL_new_functor(PL_new_atom("crl"), 1);
  28. FUNCTOR_revoked2 = PL_new_functor(PL_new_atom("revoked"), 2);
  29. FUNCTOR_revocations1 = PL_new_functor(PL_new_atom("revocations"), 1);
  30. +#ifndef __OpenBSD__
  31. FUNCTOR_session_key1 = PL_new_functor(PL_new_atom("session_key"), 1);
  32. +#endif
  33. FUNCTOR_master_key1 = PL_new_functor(PL_new_atom("master_key"), 1);
  34. FUNCTOR_session_id1 = PL_new_functor(PL_new_atom("session_id"), 1);
  35. FUNCTOR_client_random1 = PL_new_functor(PL_new_atom("client_random"), 1);