diff options
| author | djm <> | 2008-09-06 12:17:54 +0000 |
|---|---|---|
| committer | djm <> | 2008-09-06 12:17:54 +0000 |
| commit | 38ce604e3cc97706b876b0525ddff0121115456d (patch) | |
| tree | 7ccc28afe1789ea3dbedf72365f955d5b8e105b5 /src/lib/libcrypto/rsa/rsa_saos.c | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/rsa/rsa_saos.c')
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_saos.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_saos.c b/src/lib/libcrypto/rsa/rsa_saos.c index 24fc94835e..f98e0a80a6 100644 --- a/src/lib/libcrypto/rsa/rsa_saos.c +++ b/src/lib/libcrypto/rsa/rsa_saos.c | |||
| @@ -107,7 +107,8 @@ int RSA_verify_ASN1_OCTET_STRING(int dtype, | |||
| 107 | RSA *rsa) | 107 | RSA *rsa) |
| 108 | { | 108 | { |
| 109 | int i,ret=0; | 109 | int i,ret=0; |
| 110 | unsigned char *p,*s; | 110 | unsigned char *s; |
| 111 | const unsigned char *p; | ||
| 111 | ASN1_OCTET_STRING *sig=NULL; | 112 | ASN1_OCTET_STRING *sig=NULL; |
| 112 | 113 | ||
| 113 | if (siglen != (unsigned int)RSA_size(rsa)) | 114 | if (siglen != (unsigned int)RSA_size(rsa)) |