diff libtomcrypt/src/pk/katja/katja_export.c @ 1471:6dba84798cd5

Update to libtomcrypt 1.18.1, merged with Dropbear changes
author Matt Johnston <matt@ucc.asn.au>
date Fri, 09 Feb 2018 21:44:05 +0800
parents f849a5ca2efc
children
line wrap: on
line diff
--- a/libtomcrypt/src/pk/katja/katja_export.c	Thu Feb 08 23:11:40 2018 +0800
+++ b/libtomcrypt/src/pk/katja/katja_export.c	Fri Feb 09 21:44:05 2018 +0800
@@ -5,17 +5,15 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * Tom St Denis, [email protected], http://libtom.org
  */
 #include "tomcrypt.h"
 
 /**
   @file katja_export.c
-  Export Katja LTC_PKCS-style keys, Tom St Denis
-*/  
+  Export Katja PKCS-style keys, Tom St Denis
+*/
 
-#ifdef MKAT
+#ifdef LTC_MKAT
 
 /**
     This will export either an KatjaPublicKey or KatjaPrivateKey
@@ -24,7 +22,7 @@
     @param type      The type of exported key (PK_PRIVATE or PK_PUBLIC)
     @param key       The Katja key to export
     @return CRYPT_OK if successful
-*/    
+*/
 int katja_export(unsigned char *out, unsigned long *outlen, int type, katja_key *key)
 {
    int           err;
@@ -41,35 +39,35 @@
 
    if (type == PK_PRIVATE) {
       /* private key */
-      /* output is 
+      /* output is
             Version, n, d, p, q, d mod (p-1), d mod (q - 1), 1/q mod p, pq
        */
-      if ((err = der_encode_sequence_multi(out, outlen, 
-                          LTC_ASN1_SHORT_INTEGER, 1UL, &zero, 
-                          LTC_ASN1_INTEGER, 1UL,  key->N, 
-                          LTC_ASN1_INTEGER, 1UL,  key->d, 
-                          LTC_ASN1_INTEGER, 1UL,  key->p, 
-                          LTC_ASN1_INTEGER, 1UL,  key->q, 
+      if ((err = der_encode_sequence_multi(out, outlen,
+                          LTC_ASN1_SHORT_INTEGER, 1UL, &zero,
+                          LTC_ASN1_INTEGER, 1UL,  key->N,
+                          LTC_ASN1_INTEGER, 1UL,  key->d,
+                          LTC_ASN1_INTEGER, 1UL,  key->p,
+                          LTC_ASN1_INTEGER, 1UL,  key->q,
                           LTC_ASN1_INTEGER, 1UL,  key->dP,
-                          LTC_ASN1_INTEGER, 1UL,  key->dQ, 
-                          LTC_ASN1_INTEGER, 1UL,  key->qP, 
-                          LTC_ASN1_INTEGER, 1UL,  key->pq, 
+                          LTC_ASN1_INTEGER, 1UL,  key->dQ,
+                          LTC_ASN1_INTEGER, 1UL,  key->qP,
+                          LTC_ASN1_INTEGER, 1UL,  key->pq,
                           LTC_ASN1_EOL,     0UL, NULL)) != CRYPT_OK) {
          return err;
       }
- 
+
       /* clear zero and return */
       return CRYPT_OK;
    } else {
       /* public key */
-      return der_encode_sequence_multi(out, outlen, 
-                                 LTC_ASN1_INTEGER, 1UL, key->N, 
+      return der_encode_sequence_multi(out, outlen,
+                                 LTC_ASN1_INTEGER, 1UL, key->N,
                                  LTC_ASN1_EOL,     0UL, NULL);
    }
 }
 
 #endif /* LTC_MRSA */
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */