projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
296cc7f
)
Correct EVP_PKEY_verifyrecover to EVP_PKEY_verify_recover (RT 2955).
author
Ben Laurie
<ben@links.org>
Sat, 12 Jan 2013 12:25:30 +0000
(12:25 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Sun, 13 Jan 2013 23:00:46 +0000
(23:00 +0000)
doc/crypto/EVP_PKEY_CTX_ctrl.pod
patch
|
blob
|
history
doc/crypto/EVP_PKEY_decrypt.pod
patch
|
blob
|
history
doc/crypto/EVP_PKEY_derive.pod
patch
|
blob
|
history
doc/crypto/EVP_PKEY_encrypt.pod
patch
|
blob
|
history
doc/crypto/EVP_PKEY_get_default_digest.pod
patch
|
blob
|
history
doc/crypto/EVP_PKEY_keygen.pod
patch
|
blob
|
history
doc/crypto/EVP_PKEY_sign.pod
patch
|
blob
|
history
doc/crypto/EVP_PKEY_verify.pod
patch
|
blob
|
history
doc/crypto/EVP_PKEY_verify_recover.pod
[moved from
doc/crypto/EVP_PKEY_verifyrecover.pod
with 76% similarity]
patch
|
blob
|
history
diff --git
a/doc/crypto/EVP_PKEY_CTX_ctrl.pod
b/doc/crypto/EVP_PKEY_CTX_ctrl.pod
index f2f455990f5404be58b3d70189b0c46153509fe1..13b91f1e6e578f6dda5f18417b51060a54296ed7 100644
(file)
--- a/
doc/crypto/EVP_PKEY_CTX_ctrl.pod
+++ b/
doc/crypto/EVP_PKEY_CTX_ctrl.pod
@@
-117,7
+117,7
@@
L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>,
L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>,
L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>,
L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>,
L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>,
L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>,
L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>,
-L<EVP_PKEY_verify
recover(3)|EVP_PKEY_verify
recover(3)>,
+L<EVP_PKEY_verify
_recover(3)|EVP_PKEY_verify_
recover(3)>,
L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)>
L<EVP_PKEY_keygen(3)|EVP_PKEY_keygen(3)>
L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)>
L<EVP_PKEY_keygen(3)|EVP_PKEY_keygen(3)>
diff --git
a/doc/crypto/EVP_PKEY_decrypt.pod
b/doc/crypto/EVP_PKEY_decrypt.pod
index 42b2a8c44ed16bd1c204ccba04cac92ade0bc276..847983237b9baf7b5db1596786cf741f96e5d7eb 100644
(file)
--- a/
doc/crypto/EVP_PKEY_decrypt.pod
+++ b/
doc/crypto/EVP_PKEY_decrypt.pod
@@
-83,7
+83,7
@@
L<EVP_PKEY_CTX_new(3)|EVP_PKEY_CTX_new(3)>,
L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>,
L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>,
L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>,
L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>,
L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>,
L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>,
-L<EVP_PKEY_verify
recover(3)|EVP_PKEY_verify
recover(3)>,
+L<EVP_PKEY_verify
_recover(3)|EVP_PKEY_verify_
recover(3)>,
L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)>
=head1 HISTORY
L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)>
=head1 HISTORY
diff --git
a/doc/crypto/EVP_PKEY_derive.pod
b/doc/crypto/EVP_PKEY_derive.pod
index d9d6d76c7211efb05bed90d5ed9e1cbba032c5c8..27464be5718e9385a19c9adc1261e79cf08b4ebb 100644
(file)
--- a/
doc/crypto/EVP_PKEY_derive.pod
+++ b/
doc/crypto/EVP_PKEY_derive.pod
@@
-84,7
+84,7
@@
L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>,
L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>,
L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>,
L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>,
L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>,
L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>,
L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>,
-L<EVP_PKEY_verify
recover(3)|EVP_PKEY_verify
recover(3)>,
+L<EVP_PKEY_verify
_recover(3)|EVP_PKEY_verify_
recover(3)>,
=head1 HISTORY
=head1 HISTORY
diff --git
a/doc/crypto/EVP_PKEY_encrypt.pod
b/doc/crypto/EVP_PKEY_encrypt.pod
index 91c9c5d0a5d302e9068c9c89bc4e3b116d0af408..e495a81242b98950ac700c46eca934c15ae71c37 100644
(file)
--- a/
doc/crypto/EVP_PKEY_encrypt.pod
+++ b/
doc/crypto/EVP_PKEY_encrypt.pod
@@
-83,7
+83,7
@@
L<EVP_PKEY_CTX_new(3)|EVP_PKEY_CTX_new(3)>,
L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>,
L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>,
L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>,
L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>,
L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>,
L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>,
-L<EVP_PKEY_verify
recover(3)|EVP_PKEY_verify
recover(3)>,
+L<EVP_PKEY_verify
_recover(3)|EVP_PKEY_verify_
recover(3)>,
L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)>
=head1 HISTORY
L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)>
=head1 HISTORY
diff --git
a/doc/crypto/EVP_PKEY_get_default_digest.pod
b/doc/crypto/EVP_PKEY_get_default_digest.pod
index 1a9c7954c55ab850bda04ece93ae04c20a61493d..8ff597d44adf6903b8ec73892983eb13e12af914 100644
(file)
--- a/
doc/crypto/EVP_PKEY_get_default_digest.pod
+++ b/
doc/crypto/EVP_PKEY_get_default_digest.pod
@@
-32,7
+32,7
@@
public key algorithm.
L<EVP_PKEY_CTX_new(3)|EVP_PKEY_CTX_new(3)>,
L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>,
L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>,
L<EVP_PKEY_CTX_new(3)|EVP_PKEY_CTX_new(3)>,
L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>,
L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>,
-L<EVP_PKEY_verify
recover(3)|EVP_PKEY_verify
recover(3)>,
+L<EVP_PKEY_verify
_recover(3)|EVP_PKEY_verify_
recover(3)>,
=head1 HISTORY
=head1 HISTORY
diff --git
a/doc/crypto/EVP_PKEY_keygen.pod
b/doc/crypto/EVP_PKEY_keygen.pod
index 37c6fe95030dc6c7dc1c57ef8e04b170b1c0cd47..fd431ace6dcc16dce6abac86633f43e5929c46c7 100644
(file)
--- a/
doc/crypto/EVP_PKEY_keygen.pod
+++ b/
doc/crypto/EVP_PKEY_keygen.pod
@@
-151,7
+151,7
@@
L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>,
L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>,
L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>,
L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>,
L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>,
L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>,
L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>,
-L<EVP_PKEY_verify
recover(3)|EVP_PKEY_verify
recover(3)>,
+L<EVP_PKEY_verify
_recover(3)|EVP_PKEY_verify_
recover(3)>,
L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)>
=head1 HISTORY
L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)>
=head1 HISTORY
diff --git
a/doc/crypto/EVP_PKEY_sign.pod
b/doc/crypto/EVP_PKEY_sign.pod
index 2fb52c34863f9e084ad968814650ff914a8d572d..a044f2c13127fa3a6d71ec5db1a8869f7350c94e 100644
(file)
--- a/
doc/crypto/EVP_PKEY_sign.pod
+++ b/
doc/crypto/EVP_PKEY_sign.pod
@@
-86,7
+86,7
@@
L<EVP_PKEY_CTX_new(3)|EVP_PKEY_CTX_new(3)>,
L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>,
L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>,
L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>,
L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>,
L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>,
L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>,
-L<EVP_PKEY_verify
recover(3)|EVP_PKEY_verify
recover(3)>,
+L<EVP_PKEY_verify
_recover(3)|EVP_PKEY_verify_
recover(3)>,
L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)>
=head1 HISTORY
L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)>
=head1 HISTORY
diff --git
a/doc/crypto/EVP_PKEY_verify.pod
b/doc/crypto/EVP_PKEY_verify.pod
index f93e5fc6c3af0958a8b082b7d0f6d85cbf56e682..90612ba2f07aec4d0f37ce76f450dec7d8811203 100644
(file)
--- a/
doc/crypto/EVP_PKEY_verify.pod
+++ b/
doc/crypto/EVP_PKEY_verify.pod
@@
-81,7
+81,7
@@
L<EVP_PKEY_CTX_new(3)|EVP_PKEY_CTX_new(3)>,
L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>,
L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>,
L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>,
L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>,
L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>,
L<EVP_PKEY_sign(3)|EVP_PKEY_sign(3)>,
-L<EVP_PKEY_verify
recover(3)|EVP_PKEY_verify
recover(3)>,
+L<EVP_PKEY_verify
_recover(3)|EVP_PKEY_verify_
recover(3)>,
L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)>
=head1 HISTORY
L<EVP_PKEY_derive(3)|EVP_PKEY_derive(3)>
=head1 HISTORY
diff --git
a/doc/crypto/EVP_PKEY_verifyrecover.pod
b/doc/crypto/EVP_PKEY_verify_recover.pod
similarity index 76%
rename from
doc/crypto/EVP_PKEY_verifyrecover.pod
rename to
doc/crypto/EVP_PKEY_verify_recover.pod
index f3605eb8264e3d935a7cf7a55f29c43b2cd632d3..23a28a9c43e86e56081d4ec7d653e2dca0e1d9fe 100644
(file)
--- a/
doc/crypto/EVP_PKEY_verifyrecover.pod
+++ b/
doc/crypto/EVP_PKEY_verify_recover.pod
@@
-2,23
+2,23
@@
=head1 NAME
=head1 NAME
-EVP_PKEY_verify
recover_init, EVP_PKEY_verify
recover - recover signature using a public key algorithm
+EVP_PKEY_verify
_recover_init, EVP_PKEY_verify_
recover - recover signature using a public key algorithm
=head1 SYNOPSIS
#include <openssl/evp.h>
=head1 SYNOPSIS
#include <openssl/evp.h>
- int EVP_PKEY_verifyrecover_init(EVP_PKEY_CTX *ctx);
- int EVP_PKEY_verifyrecover(EVP_PKEY_CTX *ctx,
+ int EVP_PKEY_verify
_
recover_init(EVP_PKEY_CTX *ctx);
+ int EVP_PKEY_verify
_
recover(EVP_PKEY_CTX *ctx,
unsigned char *rout, size_t *routlen,
const unsigned char *sig, size_t siglen);
=head1 DESCRIPTION
unsigned char *rout, size_t *routlen,
const unsigned char *sig, size_t siglen);
=head1 DESCRIPTION
-The EVP_PKEY_verifyrecover_init() function initializes a public key algorithm
+The EVP_PKEY_verify
_
recover_init() function initializes a public key algorithm
context using key B<pkey> for a verify recover operation.
context using key B<pkey> for a verify recover operation.
-The EVP_PKEY_verifyrecover() function recovers signed data
+The EVP_PKEY_verify
_
recover() function recovers signed data
using B<ctx>. The signature is specified using the B<sig> and
B<siglen> parameters. If B<rout> is B<NULL> then the maximum size of the output
buffer is written to the B<routlen> parameter. If B<rout> is not B<NULL> then
using B<ctx>. The signature is specified using the B<sig> and
B<siglen> parameters. If B<rout> is B<NULL> then the maximum size of the output
buffer is written to the B<routlen> parameter. If B<rout> is not B<NULL> then
@@
-36,16
+36,16
@@
Sometimes however it is useful to obtain the data originally signed using a
signing operation. Only certain public key algorithms can recover a signature
in this way (for example RSA in PKCS padding mode).
signing operation. Only certain public key algorithms can recover a signature
in this way (for example RSA in PKCS padding mode).
-After the call to EVP_PKEY_verifyrecover_init() algorithm specific control
+After the call to EVP_PKEY_verify
_
recover_init() algorithm specific control
operations can be performed to set any appropriate parameters for the
operation.
operations can be performed to set any appropriate parameters for the
operation.
-The function EVP_PKEY_verifyrecover() can be called more than once on the same
+The function EVP_PKEY_verify
_
recover() can be called more than once on the same
context if several operations are performed using the same parameters.
=head1 RETURN VALUES
context if several operations are performed using the same parameters.
=head1 RETURN VALUES
-EVP_PKEY_verify
recover_init() and EVP_PKEY_verify
recover() return 1 for success
+EVP_PKEY_verify
_recover_init() and EVP_PKEY_verify_
recover() return 1 for success
and 0 or a negative value for failure. In particular a return value of -2
indicates the operation is not supported by the public key algorithm.
and 0 or a negative value for failure. In particular a return value of -2
indicates the operation is not supported by the public key algorithm.
@@
-66,7
+66,7
@@
Recover digest originally signed using PKCS#1 and SHA256 digest:
ctx = EVP_PKEY_CTX_new(verify_key);
if (!ctx)
/* Error occurred */
ctx = EVP_PKEY_CTX_new(verify_key);
if (!ctx)
/* Error occurred */
- if (EVP_PKEY_verifyrecover_init(ctx) <= 0)
+ if (EVP_PKEY_verify
_
recover_init(ctx) <= 0)
/* Error */
if (EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PADDING) <= 0)
/* Error */
/* Error */
if (EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PADDING) <= 0)
/* Error */
@@
-74,7
+74,7
@@
Recover digest originally signed using PKCS#1 and SHA256 digest:
/* Error */
/* Determine buffer length */
/* Error */
/* Determine buffer length */
- if (EVP_PKEY_verifyrecover(ctx, NULL, &routlen, sig, siglen) <= 0)
+ if (EVP_PKEY_verify
_
recover(ctx, NULL, &routlen, sig, siglen) <= 0)
/* Error */
rout = OPENSSL_malloc(routlen);
/* Error */
rout = OPENSSL_malloc(routlen);
@@
-82,7
+82,7
@@
Recover digest originally signed using PKCS#1 and SHA256 digest:
if (!rout)
/* malloc failure */
if (!rout)
/* malloc failure */
- if (EVP_PKEY_verifyrecover(ctx, rout, &routlen, sig, siglen) <= 0)
+ if (EVP_PKEY_verify
_
recover(ctx, rout, &routlen, sig, siglen) <= 0)
/* Error */
/* Recovered data is routlen bytes written to buffer rout */
/* Error */
/* Recovered data is routlen bytes written to buffer rout */