mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

36 lines
1.4 KiB

  1. --- ./crypto/wvx509.cc.orig 2004-11-18 15:15:05.000000000 +0100
  2. +++ ./crypto/wvx509.cc 2005-07-19 14:35:09.000000000 +0200
  3. @@ -1162,12 +1162,19 @@
  4. else
  5. {
  6. void *ext_data = NULL;
  7. +#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
  8. + const unsigned char **ext_value_data;
  9. + ext_value_data = (const_cast<const unsigned char **>
  10. + (&ext->value->data));
  11. +#else
  12. + unsigned char **ext_value_data = &ext->value->data;
  13. +#endif
  14. if (method->it)
  15. - ext_data = ASN1_item_d2i(NULL, &ext->value->data,
  16. + ext_data = ASN1_item_d2i(NULL, ext_value_data,
  17. ext->value->length,
  18. ASN1_ITEM_ptr(method->it));
  19. else
  20. - ext_data = method->d2i(NULL, &ext->value->data,
  21. + ext_data = method->d2i(NULL, ext_value_data,
  22. ext->value->length);
  23. if (method->i2s)
  24. --- ./crypto/wvtripledes.cc.orig 2004-11-18 15:15:05.000000000 +0100
  25. +++ ./crypto/wvtripledes.cc 2005-07-19 14:35:09.000000000 +0200
  26. @@ -102,7 +102,8 @@
  27. // ECB works 64bits at a time
  28. while (len >= 8)
  29. {
  30. -#if OPENSSL_VERSION_NUMBER >= 0x0090705FL
  31. +#if OPENSSL_VERSION_NUMBER >= 0x0090705fL \
  32. + && OPENSSL_VERSION_NUMBER < 0x0090800fL
  33. DES_ecb3_encrypt(data, crypt,
  34. &deskey1, &deskey2, &deskey3,
  35. mode == ECBEncrypt ? DES_ENCRYPT : DES_DECRYPT);