projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
warning.
[oweals/openssl.git]
/
crypto
/
asn1
/
d2i_r_pr.c
diff --git
a/crypto/asn1/d2i_r_pr.c
b/crypto/asn1/d2i_r_pr.c
index 8e46efce8a19314923552dc530ebe050c58b0d36..6c8a45f821faf2f2c2622a59f904515318e07c41 100644
(file)
--- a/
crypto/asn1/d2i_r_pr.c
+++ b/
crypto/asn1/d2i_r_pr.c
@@
-56,6
+56,7
@@
* [including the GNU Public Licence.]
*/
* [including the GNU Public Licence.]
*/
+#ifndef NO_RSA
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/bn.h>
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/bn.h>
@@
-63,12
+64,6
@@
#include <openssl/objects.h>
#include <openssl/asn1_mac.h>
#include <openssl/objects.h>
#include <openssl/asn1_mac.h>
-/*
- * ASN1err(ASN1_F_D2I_RSAPRIVATEKEY,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_I2D_RSAPRIVATEKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
- * ASN1err(ASN1_F_I2D_RSAPRIVATEKEY,ASN1_R_PARSING);
- */
-
static ASN1_METHOD method={
(int (*)()) i2d_RSAPrivateKey,
(char *(*)())d2i_RSAPrivateKey,
static ASN1_METHOD method={
(int (*)()) i2d_RSAPrivateKey,
(char *(*)())d2i_RSAPrivateKey,
@@
-112,7
+107,7
@@
RSA *d2i_RSAPrivateKey(RSA **a, unsigned char **pp, long length)
if ((ret->iqmp=BN_bin2bn(bs->data,bs->length,ret->iqmp)) == NULL)
goto err_bn;
if ((ret->iqmp=BN_bin2bn(bs->data,bs->length,ret->iqmp)) == NULL)
goto err_bn;
- ASN1_INTEGER_free(bs);
+
M_
ASN1_INTEGER_free(bs);
M_ASN1_D2I_Finish_2(a);
err_bn:
M_ASN1_D2I_Finish_2(a);
err_bn:
@@
-120,7
+115,14
@@
err_bn:
err:
ASN1err(ASN1_F_D2I_RSAPRIVATEKEY,i);
if ((ret != NULL) && ((a == NULL) || (*a != ret))) RSA_free(ret);
err:
ASN1err(ASN1_F_D2I_RSAPRIVATEKEY,i);
if ((ret != NULL) && ((a == NULL) || (*a != ret))) RSA_free(ret);
- if (bs != NULL) ASN1_INTEGER_free(bs);
+ if (bs != NULL) M_ASN1_INTEGER_free(bs);
+
return(NULL);
}
return(NULL);
}
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+#endif