diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/d2i_s_pr.c')
-rw-r--r-- | src/lib/libcrypto/asn1/d2i_s_pr.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/lib/libcrypto/asn1/d2i_s_pr.c b/src/lib/libcrypto/asn1/d2i_s_pr.c index 32ff8ba4b3..050e1cc5fb 100644 --- a/src/lib/libcrypto/asn1/d2i_s_pr.c +++ b/src/lib/libcrypto/asn1/d2i_s_pr.c | |||
@@ -56,25 +56,17 @@ | |||
56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
57 | */ | 57 | */ |
58 | 58 | ||
59 | /* Origional version from Steven Schoch <schoch@sheba.arc.nasa.gov> */ | 59 | /* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */ |
60 | 60 | ||
61 | #ifndef NO_DSA | ||
61 | #include <stdio.h> | 62 | #include <stdio.h> |
62 | #include "cryptlib.h" | 63 | #include "cryptlib.h" |
63 | #include "bn.h" | 64 | #include <openssl/bn.h> |
64 | #include "dsa.h" | 65 | #include <openssl/dsa.h> |
65 | #include "objects.h" | 66 | #include <openssl/objects.h> |
66 | #include "asn1_mac.h" | 67 | #include <openssl/asn1_mac.h> |
67 | 68 | ||
68 | /* | 69 | DSA *d2i_DSAPrivateKey(DSA **a, unsigned char **pp, long length) |
69 | * ASN1err(ASN1_F_D2I_DSAPRIVATEKEY,ASN1_R_LENGTH_MISMATCH); | ||
70 | * ASN1err(ASN1_F_I2D_DSAPRIVATEKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); | ||
71 | * ASN1err(ASN1_F_I2D_DSAPRIVATEKEY,ASN1_R_PARSING); | ||
72 | */ | ||
73 | |||
74 | DSA *d2i_DSAPrivateKey(a,pp,length) | ||
75 | DSA **a; | ||
76 | unsigned char **pp; | ||
77 | long length; | ||
78 | { | 70 | { |
79 | int i=ASN1_R_PARSING; | 71 | int i=ASN1_R_PARSING; |
80 | ASN1_INTEGER *bs=NULL; | 72 | ASN1_INTEGER *bs=NULL; |
@@ -110,4 +102,4 @@ err: | |||
110 | if (bs != NULL) ASN1_INTEGER_free(bs); | 102 | if (bs != NULL) ASN1_INTEGER_free(bs); |
111 | return(NULL); | 103 | return(NULL); |
112 | } | 104 | } |
113 | 105 | #endif | |