010-static.patch 3.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899
  1. --- a/crypto/ec/ec_local.h
  2. +++ b/crypto/ec/ec_local.h
  3. @@ -253,9 +253,9 @@ struct ec_key_st {
  4. int eckey_compute_pubkey(EC_KEY *eckey);
  5. int ecdh_compute_key(unsigned char **out, size_t *out_len,
  6. const EC_POINT *pub_key, const EC_KEY *ecdh);
  7. -int ecdsa_verify(int type, const unsigned char *dgst, int dgst_len,
  8. +int libressl_ecdsa_verify(int type, const unsigned char *dgst, int dgst_len,
  9. const unsigned char *sigbuf, int sig_len, EC_KEY *eckey);
  10. -int ecdsa_verify_sig(const unsigned char *dgst, int dgst_len,
  11. +int libressl_ecdsa_verify_sig(const unsigned char *dgst, int dgst_len,
  12. const ECDSA_SIG *sig, EC_KEY *eckey);
  13. /*
  14. --- a/crypto/ecdsa/ecdsa.c
  15. +++ b/crypto/ecdsa/ecdsa.c
  16. @@ -217,7 +217,7 @@ ecdsa_prepare_digest(const unsigned char
  17. }
  18. int
  19. -ecdsa_sign(int type, const unsigned char *digest, int digest_len,
  20. +libressl_ecdsa_sign(int type, const unsigned char *digest, int digest_len,
  21. unsigned char *signature, unsigned int *signature_len, const BIGNUM *kinv,
  22. const BIGNUM *r, EC_KEY *key)
  23. {
  24. @@ -266,7 +266,7 @@ LCRYPTO_ALIAS(ECDSA_sign);
  25. */
  26. int
  27. -ecdsa_sign_setup(EC_KEY *key, BN_CTX *in_ctx, BIGNUM **out_kinv, BIGNUM **out_r)
  28. +libressl_ecdsa_sign_setup(EC_KEY *key, BN_CTX *in_ctx, BIGNUM **out_kinv, BIGNUM **out_r)
  29. {
  30. const EC_GROUP *group;
  31. EC_POINT *point = NULL;
  32. @@ -517,7 +517,7 @@ ecdsa_compute_s(BIGNUM **out_s, const BI
  33. */
  34. ECDSA_SIG *
  35. -ecdsa_sign_sig(const unsigned char *digest, int digest_len,
  36. +libressl_ecdsa_sign_sig(const unsigned char *digest, int digest_len,
  37. const BIGNUM *in_kinv, const BIGNUM *in_r, EC_KEY *key)
  38. {
  39. BN_CTX *ctx = NULL;
  40. @@ -600,7 +600,7 @@ ECDSA_do_sign(const unsigned char *diges
  41. LCRYPTO_ALIAS(ECDSA_do_sign);
  42. int
  43. -ecdsa_verify(int type, const unsigned char *digest, int digest_len,
  44. +libressl_ecdsa_verify(int type, const unsigned char *digest, int digest_len,
  45. const unsigned char *sigbuf, int sig_len, EC_KEY *key)
  46. {
  47. ECDSA_SIG *s;
  48. @@ -649,7 +649,7 @@ LCRYPTO_ALIAS(ECDSA_verify);
  49. */
  50. int
  51. -ecdsa_verify_sig(const unsigned char *digest, int digest_len,
  52. +libressl_ecdsa_verify_sig(const unsigned char *digest, int digest_len,
  53. const ECDSA_SIG *sig, EC_KEY *key)
  54. {
  55. const EC_GROUP *group;
  56. --- a/crypto/ecdsa/ecdsa_local.h
  57. +++ b/crypto/ecdsa/ecdsa_local.h
  58. @@ -68,12 +68,12 @@ struct ECDSA_SIG_st {
  59. BIGNUM *s;
  60. };
  61. -int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *in_ctx, BIGNUM **out_kinv,
  62. +int libressl_ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *in_ctx, BIGNUM **out_kinv,
  63. BIGNUM **out_r);
  64. -int ecdsa_sign(int type, const unsigned char *digest, int digest_len,
  65. +int libressl_ecdsa_sign(int type, const unsigned char *digest, int digest_len,
  66. unsigned char *signature, unsigned int *signature_len, const BIGNUM *kinv,
  67. const BIGNUM *r, EC_KEY *eckey);
  68. -ECDSA_SIG *ecdsa_sign_sig(const unsigned char *digest, int digest_len,
  69. +ECDSA_SIG *libressl_ecdsa_sign_sig(const unsigned char *digest, int digest_len,
  70. const BIGNUM *in_kinv, const BIGNUM *in_r, EC_KEY *eckey);
  71. __END_HIDDEN_DECLS
  72. --- a/crypto/ec/ec_key.c
  73. +++ b/crypto/ec/ec_key.c
  74. @@ -774,12 +774,12 @@ static const EC_KEY_METHOD openssl_ec_ke
  75. .keygen = ec_key_gen,
  76. .compute_key = ecdh_compute_key,
  77. - .sign = ecdsa_sign,
  78. - .sign_setup = ecdsa_sign_setup,
  79. - .sign_sig = ecdsa_sign_sig,
  80. + .sign = libressl_ecdsa_sign,
  81. + .sign_setup = libressl_ecdsa_sign_setup,
  82. + .sign_sig = libressl_ecdsa_sign_sig,
  83. - .verify = ecdsa_verify,
  84. - .verify_sig = ecdsa_verify_sig,
  85. + .verify = libressl_ecdsa_verify,
  86. + .verify_sig = libressl_ecdsa_verify_sig,
  87. };
  88. const EC_KEY_METHOD *