projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the algorithm implementations depend on the corresponding
[oweals/openssl.git]
/
crypto
/
asn1
/
d2i_r_pu.c
diff --git
a/crypto/asn1/d2i_r_pu.c
b/crypto/asn1/d2i_r_pu.c
index a4e2c22f36613548f80bb6f4cb58f6aef008d6b8..9e5d41cf5318e18b1d0c12e7558f773aeb05c258 100644
(file)
--- a/
crypto/asn1/d2i_r_pu.c
+++ b/
crypto/asn1/d2i_r_pu.c
@@
-56,22
+56,19
@@
* [including the GNU Public Licence.]
*/
* [including the GNU Public Licence.]
*/
+#ifndef NO_RSA
#include <stdio.h>
#include "cryptlib.h"
#include <stdio.h>
#include "cryptlib.h"
-#include
"bn.h"
-#include
"rsa.h"
-#include
"objects.h"
-#include
"asn1_mac.h"
+#include
<openssl/bn.h>
+#include
<openssl/rsa.h>
+#include
<openssl/objects.h>
+#include
<openssl/asn1_mac.h>
-/*
- * ASN1err(ASN1_F_D2I_RSAPUBLICKEY,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_I2D_RSAPUBLICKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
- */
+#ifndef NO_NEG_PUBKEY_BUG
+#define d2i_ASN1_INTEGER d2i_ASN1_UINTEGER
+#endif
-RSA *d2i_RSAPublicKey(a,pp,length)
-RSA **a;
-unsigned char **pp;
-long length;
+RSA *d2i_RSAPublicKey(RSA **a, unsigned char **pp, long length)
{
int i=ASN1_R_PARSING;
ASN1_INTEGER *bs=NULL;
{
int i=ASN1_R_PARSING;
ASN1_INTEGER *bs=NULL;
@@
-84,7
+81,7
@@
long length;
M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
if ((ret->e=BN_bin2bn(bs->data,bs->length,ret->e)) == NULL) goto err_bn;
M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
if ((ret->e=BN_bin2bn(bs->data,bs->length,ret->e)) == NULL) goto err_bn;
- ASN1_INTEGER_free(bs);
+
M_
ASN1_INTEGER_free(bs);
bs=NULL;
M_ASN1_D2I_Finish_2(a);
bs=NULL;
M_ASN1_D2I_Finish_2(a);
@@
-94,7
+91,13
@@
err_bn:
err:
ASN1err(ASN1_F_D2I_RSAPUBLICKEY,i);
if ((ret != NULL) && ((a == NULL) || (*a != ret))) RSA_free(ret);
err:
ASN1err(ASN1_F_D2I_RSAPUBLICKEY,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