rdesktop.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455
  1. --- secure.c.orig 2002-12-31 11:58:07.000000000 +0100
  2. +++ secure.c 2002-12-31 11:59:03.000000000 +0100
  3. @@ -20,10 +20,10 @@
  4. #include "rdesktop.h"
  5. -#include <rc4.h>
  6. -#include <md5.h>
  7. -#include <sha.h>
  8. -#include <bn.h>
  9. +#include "openssl/rc4.h"
  10. +#include "openssl/md5.h"
  11. +#include "openssl/sha.h"
  12. +#include "openssl/bn.h"
  13. extern char *hostname;
  14. extern int width;
  15. @@ -280,7 +280,7 @@
  16. sec_rsa_encrypt(uint8 *out, uint8 *in, int len,
  17. uint8 *modulus, uint8 *exponent)
  18. {
  19. - BN_CTX ctx;
  20. + BN_CTX *ctx;
  21. BIGNUM mod, exp, x, y;
  22. uint8 inr[SEC_MODULUS_SIZE];
  23. int outlen;
  24. @@ -290,7 +290,8 @@
  25. memcpy(inr, in, len);
  26. reverse(inr, len);
  27. - BN_CTX_init(&ctx);
  28. + ctx = BN_CTX_new();
  29. + BN_CTX_init(ctx);
  30. BN_init(&mod);
  31. BN_init(&exp);
  32. BN_init(&x);
  33. @@ -299,7 +300,7 @@
  34. BN_bin2bn(modulus, SEC_MODULUS_SIZE, &mod);
  35. BN_bin2bn(exponent, SEC_EXPONENT_SIZE, &exp);
  36. BN_bin2bn(inr, len, &x);
  37. - BN_mod_exp(&y, &x, &exp, &mod, &ctx);
  38. + BN_mod_exp(&y, &x, &exp, &mod, ctx);
  39. outlen = BN_bn2bin(&y, out);
  40. reverse(out, outlen);
  41. if (outlen < SEC_MODULUS_SIZE)
  42. @@ -309,7 +310,7 @@
  43. BN_clear_free(&x);
  44. BN_free(&exp);
  45. BN_free(&mod);
  46. - BN_CTX_free(&ctx);
  47. + BN_CTX_free(ctx);
  48. }