diff options
| author | miod <> | 2014-04-13 15:25:35 +0000 | 
|---|---|---|
| committer | miod <> | 2014-04-13 15:25:35 +0000 | 
| commit | d2b3c9742a7df4ab87384039c99682d1944f66d7 (patch) | |
| tree | 74f4ff344980894c7c9ceeab9b81176ac7572566 /src/lib/libcrypto/asn1/a_int.c | |
| parent | dbf195d7fd4efbe4ee578f1dc5c72e7f3deadf18 (diff) | |
| download | openbsd-d2b3c9742a7df4ab87384039c99682d1944f66d7.tar.gz openbsd-d2b3c9742a7df4ab87384039c99682d1944f66d7.tar.bz2 openbsd-d2b3c9742a7df4ab87384039c99682d1944f66d7.zip | |
Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.
Diffstat (limited to 'src/lib/libcrypto/asn1/a_int.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/a_int.c | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/src/lib/libcrypto/asn1/a_int.c b/src/lib/libcrypto/asn1/a_int.c index ad0d2506f6..297c45a9ff 100644 --- a/src/lib/libcrypto/asn1/a_int.c +++ b/src/lib/libcrypto/asn1/a_int.c | |||
| @@ -116,7 +116,7 @@ int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp) | |||
| 116 | int pad=0,ret,i,neg; | 116 | int pad=0,ret,i,neg; | 
| 117 | unsigned char *p,*n,pb=0; | 117 | unsigned char *p,*n,pb=0; | 
| 118 | 118 | ||
| 119 | if ((a == NULL) || (a->data == NULL)) return(0); | 119 | if (a == NULL) return(0); | 
| 120 | neg=a->type & V_ASN1_NEG; | 120 | neg=a->type & V_ASN1_NEG; | 
| 121 | if (a->length == 0) | 121 | if (a->length == 0) | 
| 122 | ret=1; | 122 | ret=1; | 
