Changeset 1398:8285e9c45919 in roaraudio

Timestamp:

03/25/09 17:56:56 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make password api optional

Files:

• configure (modified) (4 diffs)
• libroar/pinentry.c (modified) (10 diffs)
• libroar/sshaskpass.c (modified) (1 diff)

configure

@@ -59 +59 @@
 
 PROXY=true
+
+PASSWORD_API=true
 
 WITHOUT_CF=''
@@ -246 +248 @@
    WITHOUT_VIO="$WITHOUT_VIO"' '$(echo "$1" | cut -d- -f5)
   ;;
+  '--without-password-api')
+   PASSWORD_API=false
+  ;;
   '--without-libao')
    LIBAO=false
@@ -263 +268 @@
    ALAW=false
    ALAW_RW=false
+   PASSWORD_API=false
    WITHOUT_VIO="$WITHOUT_VIO"' dstr cmd stdio'
   ;;
@@ -493 +499 @@
  [ "$ROAR_DRIVER_CODEC"   = '' ] || echo "#define ROAR_DRIVER_CODEC     \"$ROAR_DRIVER_CODEC\""
  echo
- $ALAW     && echo '#define ROAR_SUPPORT_ALAW'
- $ALAW_RW  && echo '#define ROAR_SUPPORT_ALAW_RW'
- $MULAW    && echo '#define ROAR_SUPPORT_MULAW'
- $MULAW_RW && echo '#define ROAR_SUPPORT_MULAW_RW'
- $PROXY    && echo '#define ROAR_SUPPORT_PROXY'
+ $ALAW         && echo '#define ROAR_SUPPORT_ALAW'
+ $ALAW_RW      && echo '#define ROAR_SUPPORT_ALAW_RW'
+ $MULAW        && echo '#define ROAR_SUPPORT_MULAW'
+ $MULAW_RW     && echo '#define ROAR_SUPPORT_MULAW_RW'
+ $PROXY        && echo '#define ROAR_SUPPORT_PROXY'
+ $PASSWORD_API && echo '#define ROAR_SUPPORT_PASSWORD_API'
  echo
 

libroar/pinentry.c

@@ -36 +36 @@
 
 int roar_pinentry_open (struct roar_pinentry * pe, int flags, char * display, char * tty, char * term) {
-#ifdef ROAR_HAVE_BIN_PINENTRY
+#if defined(ROAR_HAVE_BIN_PINENTRY) && defined(ROAR_SUPPORT_PASSWORD_API)
  int in[2], out[2];
 
@@ -127 +127 @@
 
 int roar_pinentry_close(struct roar_pinentry * pe) {
-#ifdef ROAR_HAVE_BIN_PINENTRY
+#if defined(ROAR_HAVE_BIN_PINENTRY) && defined(ROAR_SUPPORT_PASSWORD_API)
  int status;
 
@@ -156 +156 @@
 
 int roar_pinentry_send (struct roar_pinentry * pe, char * cmd,  char * args) {
-#ifdef ROAR_HAVE_BIN_PINENTRY
+#if defined(ROAR_HAVE_BIN_PINENTRY) && defined(ROAR_SUPPORT_PASSWORD_API)
  size_t len;
 
@@ -192 +192 @@
 #define MAX_LINE_SIZE 2048
 int roar_pinentry_recv (struct roar_pinentry * pe, char ** line, char ** opts) {
-#ifdef ROAR_HAVE_BIN_PINENTRY
+#if defined(ROAR_HAVE_BIN_PINENTRY) && defined(ROAR_SUPPORT_PASSWORD_API)
  char realbuf[MAX_LINE_SIZE];
  char * tp;
@@ -256 +256 @@
 
 int roar_pinentry_req  (struct roar_pinentry * pe, char * cmd,  char * args, char ** line, char ** opts) {
+#ifdef ROAR_SUPPORT_PASSWORD_API
  if ( pe == NULL )
   return -1;
@@ -263 +264 @@
 
  return roar_pinentry_recv(pe, line, opts);
+#else
+ return -1;
+#endif
 }
 
@@ -282 +286 @@
 
 int roar_pinentry_set      (struct roar_pinentry * pe, char * obj, char * text) {
+#ifdef ROAR_SUPPORT_PASSWORD_API
  char req[80] = "SET";
 
@@ -296 +301 @@
 
  return roar_pinentry_req(pe, req, text, NULL, NULL);
+#else
+ return -1;
+#endif
 }
 
 int roar_pinentry_getpin   (struct roar_pinentry * pe, char ** pw, char * desc, char * prompt) {
+#ifdef ROAR_SUPPORT_PASSWORD_API
  if ( pe == NULL )
   return -1;
@@ -317 +326 @@
 
  return 0;
+#else
+ return -1;
+#endif
 }
 
 int roar_pinentry_confirm  (struct roar_pinentry * pe, char * desc, char * yes, char * no) {
+#ifdef ROAR_SUPPORT_PASSWORD_API
  if ( pe == NULL )
   return -1;
@@ -336 +349 @@
 
  return roar_pinentry_req(pe, "CONFIRM", NULL, NULL, NULL);
+#else
+ return -1;
+#endif
 }
 

libroar/sshaskpass.c

@@ -36 +36 @@
 
 int roar_sshaskpass_getpass   (char ** pw, char * desc) {
-#ifdef ROAR_HAVE_BIN_SSH_ASKPASS
+#if defined(ROAR_HAVE_BIN_SSH_ASKPASS) && defined(ROAR_SUPPORT_PASSWORD_API)
  FILE * cpipe;
  char   buf[1024];