Add manual pages for certficate/key loading and friends.

[openssl.git] / crypto / asn1 / i2d_s_pr.c

diff --git a/crypto/asn1/i2d_s_pr.c b/crypto/asn1/i2d_s_pr.c
index 6e953055482cb895e0792cdc6ce7e034f2542da4..124ad982859a5a1551a09c46444836513fa8d045 100644 (file)
--- a/crypto/asn1/i2d_s_pr.c
+++ b/crypto/asn1/i2d_s_pr.c
@@ -56,20 +56,15 @@
  * [including the GNU Public Licence.]
  */
 
  * [including the GNU Public Licence.]
  */
 

+#ifndef NO_DSA

 #include <stdio.h>
 #include "cryptlib.h"
 #include <stdio.h>
 #include "cryptlib.h"

-#include "bn.h"
-#include "dsa.h"
-#include "objects.h"
-#include "asn1_mac.h"
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/objects.h>
+#include <openssl/asn1_mac.h>

 
 

-/*
- * ASN1err(ASN1_F_I2D_DSAPRIVATEKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
- */
-
-int i2d_DSAPrivateKey(a,pp)
-DSA *a;
-unsigned char **pp;
+int i2d_DSAPrivateKey(const DSA *a, unsigned char **pp)

        {
        BIGNUM *num[6];
        unsigned char data[1];
        {
        BIGNUM *num[6];
        unsigned char data[1];


@@ -109,7 +104,7 @@ unsigned char **pp;
 
        i2d_ASN1_INTEGER(&bs,&p);
 
 
        i2d_ASN1_INTEGER(&bs,&p);
 

-       bs.data=(unsigned char *)Malloc(max+4);
+       bs.data=(unsigned char *)OPENSSL_malloc(max+4);

        if (bs.data == NULL)
                {
                ASN1err(ASN1_F_I2D_DSAPRIVATEKEY,ERR_R_MALLOC_FAILURE);
        if (bs.data == NULL)
                {
                ASN1err(ASN1_F_I2D_DSAPRIVATEKEY,ERR_R_MALLOC_FAILURE);


@@ -121,8 +116,8 @@ unsigned char **pp;
                bs.length=BN_bn2bin(num[i],bs.data);
                i2d_ASN1_INTEGER(&bs,&p);
                }
                bs.length=BN_bn2bin(num[i],bs.data);
                i2d_ASN1_INTEGER(&bs,&p);
                }

-       Free((char *)bs.data);
+       OPENSSL_free(bs.data);

        *pp=p;
        return(t);
        }
        *pp=p;
        return(t);
        }

-
+#endif