diff options
author | nectar <nectar@FreeBSD.org> | 2002-07-30 12:46:49 +0000 |
---|---|---|
committer | nectar <nectar@FreeBSD.org> | 2002-07-30 12:46:49 +0000 |
commit | 8b62a95bfc62aca74fc680ca8676348f39a51bd6 (patch) | |
tree | 8349084912ae6ced5698dc3c8d8b0166dc4786f1 /crypto/openssl/crypto/rsa/rsa.h | |
parent | 050218e0d0c68a2e1a37afaab11e3c586d4f1b7d (diff) | |
download | FreeBSD-src-8b62a95bfc62aca74fc680ca8676348f39a51bd6.zip FreeBSD-src-8b62a95bfc62aca74fc680ca8676348f39a51bd6.tar.gz |
Resolve conflicts after import of OpenSSL 0.9.6d.
Diffstat (limited to 'crypto/openssl/crypto/rsa/rsa.h')
-rw-r--r-- | crypto/openssl/crypto/rsa/rsa.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/crypto/openssl/crypto/rsa/rsa.h b/crypto/openssl/crypto/rsa/rsa.h index 1f91a49..179706a 100644 --- a/crypto/openssl/crypto/rsa/rsa.h +++ b/crypto/openssl/crypto/rsa/rsa.h @@ -102,9 +102,14 @@ typedef struct rsa_meth_st * compatibility this functionality is only enabled if the RSA_FLAG_SIGN_VER * option is set in 'flags'. */ - int (*rsa_sign)(int type, unsigned char *m, unsigned int m_len, + +/* changed m_len to m_length to avoid a conflict with a #define in + vxworks for m_len for the mbuf code. This only shows up in apps + that have USE_SOCKETS defined */ + + int (*rsa_sign)(int type, unsigned char *m, unsigned int m_length, unsigned char *sigret, unsigned int *siglen, RSA *rsa); - int (*rsa_verify)(int dtype, unsigned char *m, unsigned int m_len, + int (*rsa_verify)(int dtype, unsigned char *m, unsigned int m_length, unsigned char *sigbuf, unsigned int siglen, RSA *rsa); } RSA_METHOD; @@ -227,16 +232,16 @@ RSA *d2i_Netscape_RSA_2(RSA **a, unsigned char **pp, long length, int (*cb)()); /* The following 2 functions sign and verify a X509_SIG ASN1 object * inside PKCS#1 padded RSA encryption */ -int RSA_sign(int type, unsigned char *m, unsigned int m_len, +int RSA_sign(int type, unsigned char *m, unsigned int m_length, unsigned char *sigret, unsigned int *siglen, RSA *rsa); -int RSA_verify(int type, unsigned char *m, unsigned int m_len, +int RSA_verify(int type, unsigned char *m, unsigned int m_length, unsigned char *sigbuf, unsigned int siglen, RSA *rsa); /* The following 2 function sign and verify a ASN1_OCTET_STRING * object inside PKCS#1 padded RSA encryption */ -int RSA_sign_ASN1_OCTET_STRING(int type, unsigned char *m, unsigned int m_len, +int RSA_sign_ASN1_OCTET_STRING(int type, unsigned char *m, unsigned int m_length, unsigned char *sigret, unsigned int *siglen, RSA *rsa); -int RSA_verify_ASN1_OCTET_STRING(int type, unsigned char *m, unsigned int m_len, +int RSA_verify_ASN1_OCTET_STRING(int type, unsigned char *m, unsigned int m_length, unsigned char *sigbuf, unsigned int siglen, RSA *rsa); int RSA_blinding_on(RSA *rsa, BN_CTX *ctx); |