diff options
author | Damien Miller <djm@mindrot.org> | 2003-06-04 19:15:10 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-06-04 19:15:10 +1000 |
commit | 485397c48d5157d9d31cd81562fb557654335d40 (patch) | |
tree | 0a524db82f8d262d8a143dd189307fd3daedd8a6 | |
parent | 865173ee038a5c35a357c44e1b17e4510ddc2630 (diff) |
- (djm) Bug #577 - wrong flag in scard-opensc.c sc_private_decrypt.
ok markus@
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | scard-opensc.c | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20030603 | 1 | 20030603 |
2 | - (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from | 2 | - (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from |
3 | simon@sxw.org.uk (Also matches a change in OpenBSD a while ago) | 3 | simon@sxw.org.uk (Also matches a change in OpenBSD a while ago) |
4 | - (djm) Bug #577 - wrong flag in scard-opensc.c sc_private_decrypt. | ||
5 | ok markus@ | ||
4 | 6 | ||
5 | 20030603 | 7 | 20030603 |
6 | - (djm) Replace setproctitle replacement with code derived from | 8 | - (djm) Replace setproctitle replacement with code derived from |
@@ -429,4 +431,4 @@ | |||
429 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 431 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
430 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 432 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
431 | 433 | ||
432 | $Id: ChangeLog,v 1.2771 2003/06/04 09:06:59 djm Exp $ | 434 | $Id: ChangeLog,v 1.2772 2003/06/04 09:15:10 djm Exp $ |
diff --git a/scard-opensc.c b/scard-opensc.c index e91bc25ba..312251829 100644 --- a/scard-opensc.c +++ b/scard-opensc.c | |||
@@ -173,7 +173,8 @@ sc_private_decrypt(int flen, u_char *from, u_char *to, RSA *rsa, | |||
173 | r = sc_prkey_op_init(rsa, &key_obj); | 173 | r = sc_prkey_op_init(rsa, &key_obj); |
174 | if (r) | 174 | if (r) |
175 | return -1; | 175 | return -1; |
176 | r = sc_pkcs15_decipher(p15card, key_obj, 0, from, flen, to, flen); | 176 | r = sc_pkcs15_decipher(p15card, key_obj, SC_ALGORITHM_RSA_PAD_PKCS1, |
177 | from, flen, to, flen); | ||
177 | sc_unlock(card); | 178 | sc_unlock(card); |
178 | if (r < 0) { | 179 | if (r < 0) { |
179 | error("sc_pkcs15_decipher() failed: %s", sc_strerror(r)); | 180 | error("sc_pkcs15_decipher() failed: %s", sc_strerror(r)); |