Add the possibility to use keys handled by engines in more

[openssl.git] / apps / x509.c

diff --git a/apps/x509.c b/apps/x509.c
index ea5b0b8526c480869f093b263115284d9ed6e9f2..de25790145dad2b8fab18150d7251df9f4af648e 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -853,7 +853,7 @@ bad:
                                if (Upkey == NULL)
                                        {
                                        Upkey=load_key(bio_err,
                                if (Upkey == NULL)
                                        {
                                        Upkey=load_key(bio_err,

-                                               keyfile,keyformat, passin);
+                                               keyfile,keyformat, passin, e);

                                        if (Upkey == NULL) goto end;
                                        }
 #ifndef NO_DSA
                                        if (Upkey == NULL) goto end;
                                        }
 #ifndef NO_DSA


@@ -871,7 +871,8 @@ bad:
                                if (CAkeyfile != NULL)
                                        {
                                        CApkey=load_key(bio_err,
                                if (CAkeyfile != NULL)
                                        {
                                        CApkey=load_key(bio_err,

-                                               CAkeyfile,CAkeyformat, passin);
+                                               CAkeyfile,CAkeyformat, passin,
+                                               e);

                                        if (CApkey == NULL) goto end;
                                        }
 #ifndef NO_DSA
                                        if (CApkey == NULL) goto end;
                                        }
 #ifndef NO_DSA


@@ -898,7 +899,7 @@ bad:
                                else
                                        {
                                        pk=load_key(bio_err,
                                else
                                        {
                                        pk=load_key(bio_err,

-                                               keyfile,FORMAT_PEM, passin);
+                                               keyfile,FORMAT_PEM, passin, e);

                                        if (pk == NULL) goto end;
                                        }
 
                                        if (pk == NULL) goto end;
                                        }