Since there's no continuation, the ; can go as well :-)

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

diff --git a/crypto/asn1/d2i_pu.c b/crypto/asn1/d2i_pu.c
index f66d72fd7b4303b446c242346916e07c7949dbfb..71f2eb361bd48f183153017761354fbfea0ff2b2 100644 (file)
--- a/crypto/asn1/d2i_pu.c
+++ b/crypto/asn1/d2i_pu.c
@@ -68,9 +68,6 @@
 #ifndef OPENSSL_NO_DSA
 #include <openssl/dsa.h>
 #endif
-#ifndef OPENSSL_NO_ECDSA
-#include <openssl/ecdsa.h>
-#endif
 
 EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, unsigned char **pp,
             long length)
@@ -103,23 +100,13 @@ EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, unsigned char **pp,
 #endif
 #ifndef OPENSSL_NO_DSA
        case EVP_PKEY_DSA:
-               if ((ret->pkey.dsa=d2i_DSAPublicKey(&(ret->pkey.dsa),
+               if ((ret->pkey.dsa=d2i_DSAPublicKey(NULL,
                        (const unsigned char **)pp,length)) == NULL) /* TMP UGLY CAST */
                        {
                        ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_ASN1_LIB);
                        goto err;
                        }
                break;
-#endif
-#ifndef OPENSSL_NO_ECDSA
-       case EVP_PKEY_ECDSA:
-               if ((ret->pkey.ecdsa = ECDSAPublicKey_set_octet_string(&(ret->pkey.ecdsa), 
-                       (const unsigned char **)pp, length)) == NULL)
-                       {
-                       ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
-                       goto err;
-                       }
-       break;
 #endif
        default:
                ASN1err(ASN1_F_D2I_PUBLICKEY,ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE);