1 files changed, 31 insertions, 33 deletions

diff --git a/src/lib/libssl/src/fips/dsa/fips_dsa_lib.c b/src/lib/libcrypto/rsa/rsa_prn.c
index 2545966d2a..224db0fae5 100644
--- a/src/lib/libssl/src/fips/dsa/fips_dsa_lib.c
+++ b/src/lib/libcrypto/rsa/rsa_prn.c
@@ -1,9 +1,9 @@
-/* fips_dsa_lib.c */
+/* crypto/rsa/rsa_prn.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 2007.
+ * project 2006.
  */
 /* ====================================================================
- * Copyright (c) 2007 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -56,40 +56,38 @@
  *
  */
 
-#include <string.h>
-#include <openssl/dsa.h>
-#include <openssl/bn.h>
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
 
-/* Minimal FIPS versions of FIPS_dsa_new() and FIPS_dsa_free: to
- * reduce external dependencies. 
- */
-
-DSA *FIPS_dsa_new(void)
+#ifndef OPENSSL_NO_FP_API
+int RSA_print_fp(FILE *fp, const RSA *x, int off)
         {
-        DSA *ret;
-        ret = OPENSSL_malloc(sizeof(DSA));
-        if (!ret)
-                return NULL;
-        memset(ret, 0, sizeof(DSA));
-        ret->meth = DSA_OpenSSL();
-        if (ret->meth->init)
-                ret->meth->init(ret);
-        return ret;
+        BIO *b;
+        int ret;
+
+        if ((b=BIO_new(BIO_s_file())) == NULL)
+                {
+                RSAerr(RSA_F_RSA_PRINT_FP,ERR_R_BUF_LIB);
+                return(0);
+                }
+        BIO_set_fp(b,fp,BIO_NOCLOSE);
+        ret=RSA_print(b,x,off);
+        BIO_free(b);
+        return(ret);
         }
+#endif
 
-void FIPS_dsa_free(DSA *r)
+int RSA_print(BIO *bp, const RSA *x, int off)
         {
-        if (!r)
-                return;
-        if (r->meth->finish)
-                r->meth->finish(r);
-        if (r->p != NULL) BN_clear_free(r->p);
-        if (r->q != NULL) BN_clear_free(r->q);
-        if (r->g != NULL) BN_clear_free(r->g);
-        if (r->pub_key != NULL) BN_clear_free(r->pub_key);
-        if (r->priv_key != NULL) BN_clear_free(r->priv_key);
-        if (r->kinv != NULL) BN_clear_free(r->kinv);
-        if (r->r != NULL) BN_clear_free(r->r);
-        OPENSSL_free(r);
+        EVP_PKEY *pk;
+        int ret;
+        pk = EVP_PKEY_new();
+        if (!pk || !EVP_PKEY_set1_RSA(pk, (RSA *)x))
+                return 0;
+        ret = EVP_PKEY_print_private(bp, pk, off, NULL);
+        EVP_PKEY_free(pk);
+        return ret;
         }