projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add manual pages for certficate/key loading and friends.
[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 c4ae58b59439b419d1671d4eb035b2bba723e1a2..0d11d8598357ef0fc8ba1fe1ee2d9d7fa8832669 100644
(file)
--- a/
crypto/asn1/d2i_r_pu.c
+++ b/
crypto/asn1/d2i_r_pu.c
@@
-64,11
+64,11
@@
#include <openssl/objects.h>
#include <openssl/asn1_mac.h>
#include <openssl/objects.h>
#include <openssl/asn1_mac.h>
-#if
def
NEG_PUBKEY_BUG
+#if
ndef NO_
NEG_PUBKEY_BUG
#define d2i_ASN1_INTEGER d2i_ASN1_UINTEGER
#endif
#define d2i_ASN1_INTEGER d2i_ASN1_UINTEGER
#endif
-RSA *d2i_RSAPublicKey(RSA **a, unsigned char **pp, long length)
+RSA *d2i_RSAPublicKey(RSA **a,
const
unsigned char **pp, long length)
{
int i=ASN1_R_PARSING;
ASN1_INTEGER *bs=NULL;
{
int i=ASN1_R_PARSING;
ASN1_INTEGER *bs=NULL;
@@
-81,7
+81,7
@@
RSA *d2i_RSAPublicKey(RSA **a, unsigned char **pp, 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);
@@
-91,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
#endif