Use util/mklink.pl instead of util/mklink.sh.

[oweals/openssl.git] / crypto / asn1 / a_int.c

diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c
index ce0921d59ac76e55693ebf67f3daea32dfc1000d..6e8c7e57be99a0e28a0ce7d695c017a1033fea3e 100644 (file)
--- a/crypto/asn1/a_int.c
+++ b/crypto/asn1/a_int.c
@@ -1,5 +1,5 @@
 /* crypto/asn1/a_int.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -58,14 +58,9 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1.h"
+#include <openssl/asn1.h>
 
-/* ASN1err(ASN1_F_D2I_ASN1_INTEGER,ASN1_R_EXPECTING_AN_INTEGER);
- */
-
-int i2d_ASN1_INTEGER(a,pp)
-ASN1_INTEGER *a;
-unsigned char **pp;
+int i2d_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp)
        {
        int pad=0,ret,r,i,t;
        unsigned char *p,*pt,*n,pb=0;
@@ -116,10 +111,8 @@ unsigned char **pp;
        return(r);
        }
 
-ASN1_INTEGER *d2i_ASN1_INTEGER(a, pp, length)
-ASN1_INTEGER **a;
-unsigned char **pp;
-long length;
+ASN1_INTEGER *d2i_ASN1_INTEGER(ASN1_INTEGER **a, unsigned char **pp,
+            long length)
        {
        ASN1_INTEGER *ret=NULL;
        unsigned char *p,*to,*s;
@@ -194,9 +187,7 @@ err:
        return(NULL);
        }
 
-int ASN1_INTEGER_set(a,v)
-ASN1_INTEGER *a;
-long v;
+int ASN1_INTEGER_set(ASN1_INTEGER *a, long v)
        {
        int i,j,k;
        unsigned char buf[sizeof(long)+1];
@@ -236,8 +227,7 @@ long v;
        return(1);
        }
 
-long ASN1_INTEGER_get(a)
-ASN1_INTEGER *a;
+long ASN1_INTEGER_get(ASN1_INTEGER *a)
        {
        int neg=0,i;
        long r=0;
@@ -251,7 +241,8 @@ ASN1_INTEGER *a;
        
        if (a->length > sizeof(long))
                {
-               return(0xFFFFFFFFL);
+               /* hmm... a bit ugly */
+               return(0xffffffffL);
                }
        if (a->data == NULL)
                return(0);
@@ -265,9 +256,7 @@ ASN1_INTEGER *a;
        return(r);
        }
 
-ASN1_INTEGER *BN_to_ASN1_INTEGER(bn,ai)
-BIGNUM *bn;
-ASN1_INTEGER *ai;
+ASN1_INTEGER *BN_to_ASN1_INTEGER(BIGNUM *bn, ASN1_INTEGER *ai)
        {
        ASN1_INTEGER *ret;
        int len,j;
@@ -278,7 +267,7 @@ ASN1_INTEGER *ai;
                ret=ai;
        if (ret == NULL)
                {
-               ASN1err(ASN1_F_BN_TO_ASN1_INTEGER,ASN1_R_ERROR_STACK);
+               ASN1err(ASN1_F_BN_TO_ASN1_INTEGER,ERR_R_NESTED_ASN1_ERROR);
                goto err;
                }
        ret->type=V_ASN1_INTEGER;
@@ -292,9 +281,7 @@ err:
        return(NULL);
        }
 
-BIGNUM *ASN1_INTEGER_to_BN(ai,bn)
-ASN1_INTEGER *ai;
-BIGNUM *bn;
+BIGNUM *ASN1_INTEGER_to_BN(ASN1_INTEGER *ai, BIGNUM *bn)
        {
        BIGNUM *ret;